Merge branch 'MDL-29392' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 19 Sep 2011 23:58:04 +0000 (11:58 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 19 Sep 2011 23:58:04 +0000 (11:58 +1200)

Trivial merge