Merge branch 'wip-mdl-50042' of git://github.com/rajeshtaneja/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 4 May 2015 06:16:09 +0000 (14:16 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 4 May 2015 06:16:09 +0000 (14:16 +0800)

Trivial merge