Merge branch 'MDL-25841' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 24 Jan 2011 02:31:34 +0000 (10:31 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 24 Jan 2011 02:31:34 +0000 (10:31 +0800)

Trivial merge