Merge branch 'MDL-26819' of git://github.com/stronk7/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 29 Aug 2011 01:05:00 +0000 (13:05 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 29 Aug 2011 01:05:00 +0000 (13:05 +1200)

Trivial merge