Merge branch 'MDL-30249' of git://github.com/mouneyrac/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 21 Feb 2012 01:55:56 +0000 (14:55 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 21 Feb 2012 01:55:56 +0000 (14:55 +1300)

Trivial merge