Merge branch 'MDL-25639' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 7 Feb 2011 06:21:24 +0000 (14:21 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 7 Feb 2011 06:21:24 +0000 (14:21 +0800)

Trivial merge