Merge branch 'MDL-25657' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 4 Jan 2011 05:30:32 +0000 (13:30 +0800)
committerSam Hemelryk <sam@moodle.com>
Tue, 4 Jan 2011 05:30:32 +0000 (13:30 +0800)

Trivial merge