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

Trivial merge