Merge branch 'MDL-26168' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 31 Jan 2011 05:50:21 +0000 (13:50 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 31 Jan 2011 05:50:21 +0000 (13:50 +0800)

Trivial merge