Merge branch 'MDL-23224' of git://github.com/mouneyrac/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 10 Jan 2011 05:33:48 +0000 (13:33 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 10 Jan 2011 05:33:48 +0000 (13:33 +0800)

Trivial merge