Merge branch 'wip-MDL-25742-master' of https://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 19 Apr 2016 04:42:21 +0000 (12:42 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 19 Apr 2016 04:42:21 +0000 (12:42 +0800)

Trivial merge