Merge branch 'MDL-25887' of git://github.com/andyjdavis/moodle.git
authorSam Hemelryk <sam@moodle.com>
Tue, 18 Jan 2011 02:56:51 +0000 (10:56 +0800)
committerSam Hemelryk <sam@moodle.com>
Tue, 18 Jan 2011 02:56:51 +0000 (10:56 +0800)

Trivial merge