Merge branch 'MDL-28138' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Fri, 1 Jul 2011 09:01:57 +0000 (17:01 +0800)
committerSam Hemelryk <sam@moodle.com>
Fri, 1 Jul 2011 09:01:57 +0000 (17:01 +0800)

Trivial merge