Merge branch 'MDL-16553' of git://github.com/bostelm/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 10 Oct 2011 04:56:14 +0000 (17:56 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 10 Oct 2011 04:56:14 +0000 (17:56 +1300)

Trivial merge