Merge branch 'MDL-28014_head' of git://github.com/grabs/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 28 Jun 2011 02:12:39 +0000 (10:12 +0800)
committerSam Hemelryk <sam@moodle.com>
Tue, 28 Jun 2011 02:12:39 +0000 (10:12 +0800)

Trivial merge