Merge branch 'wip-mdl-37017' of git://github.com/rajeshtaneja/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 11 Dec 2012 01:54:16 +0000 (14:54 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 11 Dec 2012 01:54:16 +0000 (14:54 +1300)

Trivial merge