Merge branch 'MDL-27783' of git://github.com/mouneyrac/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 13 Jun 2011 03:13:29 +0000 (11:13 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 13 Jun 2011 03:13:29 +0000 (11:13 +0800)

Trivial merge