Merge branch 'MDL-26635' of git://github.com/mouneyrac/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 21 Sep 2011 05:52:53 +0000 (17:52 +1200)
committerSam Hemelryk <sam@moodle.com>
Wed, 21 Sep 2011 05:52:53 +0000 (17:52 +1200)

Trivial merge