Merge branch 'MDL-25834'
authorSam Hemelryk <sam@moodle.com>
Mon, 31 Jan 2011 06:10:12 +0000 (14:10 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 31 Jan 2011 06:10:12 +0000 (14:10 +0800)

Trivial merge