Merge branch 'MDL-29366' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 19 Sep 2011 07:19:42 +0000 (19:19 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 19 Sep 2011 07:19:42 +0000 (19:19 +1200)

Trivial merge