Merge branch 'MDL-29810' of git://github.com/bostelm/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 31 Oct 2011 04:11:08 +0000 (17:11 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 31 Oct 2011 04:11:08 +0000 (17:11 +1300)

Trivial merge