Merge branch 'wip-MDL-51604-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 15 Oct 2015 08:21:07 +0000 (16:21 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 15 Oct 2015 08:21:07 +0000 (16:21 +0800)

Trivial merge