Merge branch 'MDL-26178' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 31 Jan 2011 09:47:30 +0000 (17:47 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 31 Jan 2011 09:47:30 +0000 (17:47 +0800)

Trivial merge