Merge branch 'MDL-26199' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 27 Jun 2011 08:03:48 +0000 (16:03 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 27 Jun 2011 08:03:48 +0000 (16:03 +0800)

Trivial merge