Merge branch 'MDL-25357_wip' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 5 Jul 2011 08:51:49 +0000 (16:51 +0800)
committerSam Hemelryk <sam@moodle.com>
Tue, 5 Jul 2011 08:51:49 +0000 (16:51 +0800)

Trivial merge