Merge branch 'wip-MDL-52081-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 10 Dec 2015 09:15:10 +0000 (17:15 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 10 Dec 2015 09:15:10 +0000 (17:15 +0800)

Trivial merge