Merge branch 'MDL-28259' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 18 Sep 2011 23:40:48 +0000 (11:40 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 18 Sep 2011 23:40:48 +0000 (11:40 +1200)

Trivial merge