Merge branch 'wip-mdl-51106' of git://github.com/rajeshtaneja/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 17 Aug 2015 01:01:45 +0000 (09:01 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 17 Aug 2015 01:01:45 +0000 (09:01 +0800)

Trivial merge