Merge branch 'MDL-29415' of git://github.com/stronk7/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 18 Sep 2011 23:15:04 +0000 (11:15 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 18 Sep 2011 23:15:04 +0000 (11:15 +1200)

Trivial merge