Merge branch 'MDL-26240' of git://github.com/lazydaisy/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 29 Nov 2011 03:52:50 +0000 (16:52 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 29 Nov 2011 03:52:50 +0000 (16:52 +1300)

Trivial merge