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

Trivial merge