Merge remote branch 'mouneyrac/MDL-25768'
authorSam Hemelryk <sam@moodle.com>
Mon, 10 Jan 2011 08:01:08 +0000 (16:01 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 10 Jan 2011 08:01:08 +0000 (16:01 +0800)

Trivial merge