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

Trivial merge