Merge branch 'wip-MDL-53026-master' of https://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 16 Mar 2016 02:00:28 +0000 (10:00 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 16 Mar 2016 02:00:28 +0000 (10:00 +0800)

Trivial merge