Merge branch 'MDL-28718' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 25 Oct 2011 03:47:20 +0000 (16:47 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 25 Oct 2011 03:47:20 +0000 (16:47 +1300)

Trivial merge