Merge branch 'wip-MDL-52475-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Fri, 11 Dec 2015 03:23:41 +0000 (11:23 +0800)
committerDavid Monllao <davidm@moodle.com>
Fri, 11 Dec 2015 03:23:41 +0000 (11:23 +0800)

Trivial merge