Merge branch 'MDL-29072' of git://github.com/bostelm/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 5 Sep 2011 01:41:04 +0000 (13:41 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 5 Sep 2011 01:41:04 +0000 (13:41 +1200)

Trivial merge