Merge branch 'MDL-31923-master-6' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 12 Mar 2012 01:33:42 +0000 (14:33 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 12 Mar 2012 01:33:42 +0000 (14:33 +1300)

Trivial merge