Merge branch 'MDL-27952' of git://github.com/stronk7/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 22 Jun 2011 09:20:49 +0000 (17:20 +0800)
committerSam Hemelryk <sam@moodle.com>
Wed, 22 Jun 2011 09:20:49 +0000 (17:20 +0800)

Trivial merge