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

Trivial merge