Merge branch 'wip-mdl-53300' of https://github.com/rajeshtaneja/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 8 Mar 2016 08:13:42 +0000 (16:13 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 8 Mar 2016 08:13:42 +0000 (16:13 +0800)

Trivial merge