Merge branch 'wip-mdl-52799' of git://github.com/rajeshtaneja/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 25 Jan 2016 06:39:33 +0000 (14:39 +0800)
committerDavid Monllao <davidm@moodle.com>
Fri, 29 Jan 2016 02:15:16 +0000 (10:15 +0800)

Trivial merge