Merge branch 'wip-mdl-21180' of https://github.com/rajeshtaneja/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 16 Dec 2013 02:44:15 +0000 (15:44 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 16 Dec 2013 02:44:15 +0000 (15:44 +1300)

Trivial merge