Merge branch 'MDL-29978' of git://github.com/stronk7/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 31 Oct 2011 00:51:07 +0000 (13:51 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 31 Oct 2011 00:51:07 +0000 (13:51 +1300)

Trivial merge