Merge branch 'wip-MDL-32037-master' of git://github.com/marinaglancy/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 20 Mar 2012 00:33:30 +0000 (13:33 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 20 Mar 2012 00:33:30 +0000 (13:33 +1300)

Trivial merge