Merge branch 'wip-MDL-50932-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 17 Aug 2015 03:43:42 +0000 (11:43 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 17 Aug 2015 03:43:42 +0000 (11:43 +0800)

Trivial merge