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

Trivial merge