Merge branch 'MDL-33189-master-1' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 23 May 2012 23:11:13 +0000 (11:11 +1200)
committerSam Hemelryk <sam@moodle.com>
Wed, 23 May 2012 23:11:13 +0000 (11:11 +1200)

Trivial merge