Merge branch 'MDL-25637'
authorSam Hemelryk <sam@moodle.com>
Mon, 24 Jan 2011 08:20:51 +0000 (16:20 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 24 Jan 2011 08:20:51 +0000 (16:20 +0800)

Trivial merge