Merge branch 'wip-mdl-48250' of https://github.com/rajeshtaneja/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 18 Nov 2014 04:37:57 +0000 (17:37 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 18 Nov 2014 04:37:57 +0000 (17:37 +1300)

Trivial merge