Merge branch 'MDL-28170' of git://github.com/stronk7/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 17 Oct 2011 05:52:23 +0000 (18:52 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 17 Oct 2011 05:52:23 +0000 (18:52 +1300)

Trivial merge