Merge branch 'MDL-32137-master-1' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 3 Apr 2012 20:22:16 +0000 (08:22 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 3 Apr 2012 20:22:16 +0000 (08:22 +1200)

Trivial merge