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

Trivial merge