Merge branch 'wip-mdl-52387' of git://github.com/rajeshtaneja/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 18 Feb 2016 03:48:14 +0000 (11:48 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 18 Feb 2016 03:48:14 +0000 (11:48 +0800)

Trivial merge