Merge branch 'MDL-29347' of git://github.com/mouneyrac/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 5 Mar 2012 03:12:38 +0000 (16:12 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 5 Mar 2012 03:12:38 +0000 (16:12 +1300)

Trivial merge