Merge branch 'MDL-30688' of git://github.com/mouneyrac/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 14 Feb 2012 02:54:00 +0000 (15:54 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 14 Feb 2012 02:54:00 +0000 (15:54 +1300)

Trivial merge