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

Trivial merge