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

Trivial merge