Merge branch 'wip-mdl-49772' of git://github.com/rajeshtaneja/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 27 May 2015 03:50:01 +0000 (11:50 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 27 May 2015 03:50:01 +0000 (11:50 +0800)

Trivial merge