Merge branch 'MDL-31231' of git://github.com/lazydaisy/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 24 Jan 2012 03:03:22 +0000 (11:03 +0800)
committerSam Hemelryk <sam@moodle.com>
Tue, 24 Jan 2012 03:03:22 +0000 (11:03 +0800)

Trivial merge