Merge branch 'MDL-28564' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 29 Aug 2011 01:58:05 +0000 (13:58 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 29 Aug 2011 01:58:05 +0000 (13:58 +1200)

Trivial merge