Merge branch 'wip-mdl-42634' of git://github.com/rajeshtaneja/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 20 Aug 2015 07:41:07 +0000 (15:41 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 20 Aug 2015 07:41:07 +0000 (15:41 +0800)

Trivial merge