Merge branch 'wip-mdl-51101' of git://github.com/rajeshtaneja/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 14 Sep 2015 08:18:01 +0000 (16:18 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 14 Sep 2015 08:18:01 +0000 (16:18 +0800)

Trivial merge