Merge branch 'MDL-29906' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 24 Oct 2011 23:25:28 +0000 (12:25 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 24 Oct 2011 23:25:28 +0000 (12:25 +1300)

Trivial merge