Merge branch 'mdl-28517' of git://github.com/colchambers/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 8 Aug 2011 06:22:51 +0000 (14:22 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 8 Aug 2011 06:22:51 +0000 (14:22 +0800)

Trivial merge