Merge branch 'wip-mdl-49061' of git://github.com/rajeshtaneja/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 20 May 2015 02:18:11 +0000 (10:18 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 20 May 2015 02:18:11 +0000 (10:18 +0800)

Trivial merge