Merge branch 'wip-mdl-51285' of git://github.com/rajeshtaneja/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 7 Oct 2015 03:22:56 +0000 (11:22 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 7 Oct 2015 03:22:56 +0000 (11:22 +0800)

Trivial merge