Merge branch 'wip-mdl-18770' of https://github.com/rajeshtaneja/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 6 Jan 2014 00:09:42 +0000 (13:09 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 6 Jan 2014 00:09:42 +0000 (13:09 +1300)

Trivial merge