Merge branch 'MDL-28618' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 8 Aug 2011 02:57:11 +0000 (10:57 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 8 Aug 2011 02:57:11 +0000 (10:57 +0800)

Trivial merge