Merge branch 'wip-MDL-50973-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 25 Aug 2015 02:13:18 +0000 (10:13 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 25 Aug 2015 02:13:18 +0000 (10:13 +0800)

Trivial merge