Merge branch 'MDL-30495' of git://github.com/mouneyrac/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 19 Feb 2012 22:50:56 +0000 (11:50 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 19 Feb 2012 22:50:56 +0000 (11:50 +1300)

Trivial merge