Merge branch 'MDL-30007' of git://github.com/stronk7/moodle
authorSam Hemelryk <sam@moodle.com>
Thu, 1 Dec 2011 04:14:52 +0000 (17:14 +1300)
committerSam Hemelryk <sam@moodle.com>
Thu, 1 Dec 2011 04:14:52 +0000 (17:14 +1300)

Trivial merge