Merge branch 'MDL-27399' of git://github.com/mouneyrac/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 13 Jun 2011 06:04:28 +0000 (14:04 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 13 Jun 2011 06:04:28 +0000 (14:04 +0800)

Trivial merge