Merge branch 'wip-MDL-41648' of https://github.com/dg711/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 8 Mar 2016 07:32:17 +0000 (15:32 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 8 Mar 2016 07:32:17 +0000 (15:32 +0800)

Trivial merge