Merge branch 'wip-MDL-49572-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 25 May 2015 09:54:00 +0000 (17:54 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 25 May 2015 09:54:00 +0000 (17:54 +0800)

Trivial merge