Merge branch 'MDL-30305-master-1' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 14 May 2012 02:48:31 +0000 (14:48 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 14 May 2012 02:48:31 +0000 (14:48 +1200)

Trivial merge