Merge branch 'wip-MDL-42463-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 29 Oct 2013 06:54:44 +0000 (14:54 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 29 Oct 2013 06:54:44 +0000 (14:54 +0800)

Trivial merge