Merge branch 'MDL-27627-master' of git://github.com/sammarshallou/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 30 May 2011 00:54:15 +0000 (08:54 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 30 May 2011 00:54:15 +0000 (08:54 +0800)

Trivial merge