Merge branch 'MDL-25760' of git://github.com/lazydaisy/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 1 Nov 2011 02:56:55 +0000 (15:56 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 1 Nov 2011 02:56:55 +0000 (15:56 +1300)

Trivial merge