Merge branch 'MDL-31013-master-1' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 23 Jan 2012 03:08:22 +0000 (11:08 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 23 Jan 2012 03:08:22 +0000 (11:08 +0800)

Trivial merge