Merge branch 'wip-MDL-45429-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 7 May 2014 03:50:09 +0000 (11:50 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 7 May 2014 03:50:09 +0000 (11:50 +0800)

Trivial merge