Merge branch 'MDL-28488' of git://github.com/stronk7/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 12 Sep 2011 01:19:12 +0000 (13:19 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 12 Sep 2011 01:19:12 +0000 (13:19 +1200)

Trivial merge