Merge branch 'MDL-29276' of git://github.com/mouneyrac/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 19 Sep 2011 02:26:58 +0000 (14:26 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 19 Sep 2011 02:26:58 +0000 (14:26 +1200)

Trivial merge