Merge branch 'wip-mdl-36958' of git://github.com/rajeshtaneja/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 8 Jan 2013 01:07:03 +0000 (14:07 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 8 Jan 2013 01:07:03 +0000 (14:07 +1300)

Trivial merge