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

Trivial merge