Merge branch 'MDL-29428' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 26 Sep 2011 01:03:54 +0000 (14:03 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 26 Sep 2011 01:03:54 +0000 (14:03 +1300)

Trivial merge