Merge branch 'wip-mdl-49456' of git://github.com/rajeshtaneja/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 16 Apr 2015 08:39:20 +0000 (16:39 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 16 Apr 2015 08:39:20 +0000 (16:39 +0800)

Trivial merge