Merge branch 'MDL-27747' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 8 Jun 2011 09:09:05 +0000 (17:09 +0800)
committerSam Hemelryk <sam@moodle.com>
Wed, 8 Jun 2011 09:09:05 +0000 (17:09 +0800)

Trivial merge