Merge branch 'MDL-30704' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 21 Dec 2011 01:30:15 +0000 (14:30 +1300)
committerSam Hemelryk <sam@moodle.com>
Wed, 21 Dec 2011 01:30:15 +0000 (14:30 +1300)

Trivial merge