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

Trivial merge