Merge branch 'MDL-25786' of git://github.com/epsd/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 31 Jan 2011 05:31:40 +0000 (13:31 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 31 Jan 2011 05:31:40 +0000 (13:31 +0800)

Trivial merge