Merge branch 'wip-mdl-52347' of git://github.com/rajeshtaneja/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 29 Dec 2015 06:03:10 +0000 (14:03 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 29 Dec 2015 06:03:10 +0000 (14:03 +0800)

Trivial merge