Merge branch 'MDL-30532' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 12 Dec 2011 22:15:27 +0000 (11:15 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 12 Dec 2011 22:15:27 +0000 (11:15 +1300)

Trivial merge