Merge branch 'MDL-26841' of git://github.com/stronk7/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 20 Sep 2011 00:14:13 +0000 (12:14 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 20 Sep 2011 00:14:13 +0000 (12:14 +1200)

Trivial merge