Merge branch 'MDL-25892' of git://github.com/epsd/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 31 Jan 2011 06:16:46 +0000 (14:16 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 31 Jan 2011 06:16:46 +0000 (14:16 +0800)

Trivial merge