Merge branch 'MDL-29459' of git://github.com/mouneyrac/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 24 Oct 2011 22:45:58 +0000 (11:45 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 24 Oct 2011 22:45:58 +0000 (11:45 +1300)

Trivial merge