Merge branch 'MDL-30518' of git://github.com/mackensen/moodle
authorSam Hemelryk <sam@moodle.com>
Thu, 8 Dec 2011 03:05:26 +0000 (16:05 +1300)
committerSam Hemelryk <sam@moodle.com>
Thu, 8 Dec 2011 03:05:26 +0000 (16:05 +1300)

Trivial merge