Merge branch 'MDL-25939'
authorSam Hemelryk <sam@moodle.com>
Mon, 7 Feb 2011 05:40:51 +0000 (13:40 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 7 Feb 2011 05:40:51 +0000 (13:40 +0800)

Trivial merge