Merge branch 'MDL-29668' of git://github.com/stronk7/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 9 Oct 2011 23:09:34 +0000 (12:09 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 9 Oct 2011 23:09:34 +0000 (12:09 +1300)

Trivial merge