Merge branch 'MDL-30744' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 18 Dec 2011 21:21:11 +0000 (10:21 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 18 Dec 2011 21:21:11 +0000 (10:21 +1300)

Trivial merge