Merge branch 'MDL-20538' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 13 Jun 2011 03:22:51 +0000 (11:22 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 13 Jun 2011 03:22:51 +0000 (11:22 +0800)

Trivial merge