Merge branch 'MDL-28268' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 11 Jul 2011 05:25:44 +0000 (13:25 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 11 Jul 2011 05:25:44 +0000 (13:25 +0800)

Trivial merge