Merge branch 'MDL-28329' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 19 Sep 2011 06:36:38 +0000 (18:36 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 19 Sep 2011 06:36:38 +0000 (18:36 +1200)

Trivial merge