Merge branch 'MDL-30322' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 30 Nov 2011 00:02:15 +0000 (13:02 +1300)
committerSam Hemelryk <sam@moodle.com>
Wed, 30 Nov 2011 00:02:15 +0000 (13:02 +1300)

Trivial merge