Merge branch 'MDL-30805-master-1' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 2 Jan 2012 21:02:18 +0000 (10:02 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 2 Jan 2012 21:02:18 +0000 (10:02 +1300)

Trivial merge