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

Trivial merge