Merge branch 'MDL-24394' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 10 Jan 2012 01:30:32 +0000 (14:30 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 10 Jan 2012 01:30:32 +0000 (14:30 +1300)

Trivial merge