Merge branch 'MDL-31164' of git://github.com/lazydaisy/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 16 Jan 2012 05:08:39 +0000 (13:08 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 16 Jan 2012 05:08:39 +0000 (13:08 +0800)

Trivial merge