Merge branch 'wip-mdl-48426' of https://github.com/rajeshtaneja/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 8 Dec 2014 23:13:26 +0000 (12:13 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 8 Dec 2014 23:13:26 +0000 (12:13 +1300)

Trivial merge