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

Trivial merge