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

Trivial merge