Merge branch 'MDL-33770' of git://github.com/mouneyrac/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 2 Jul 2012 23:48:43 +0000 (11:48 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 2 Jul 2012 23:48:43 +0000 (11:48 +1200)

Trivial merge