Merge branch 'wip-mdl-46891-m' of git://github.com/rajeshtaneja/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 17 Mar 2016 04:45:47 +0000 (12:45 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 17 Mar 2016 04:45:47 +0000 (12:45 +0800)

Trivial merge