Merge branch 'MDL-29605' of git://github.com/lazydaisy/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 3 Oct 2011 03:41:12 +0000 (16:41 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 3 Oct 2011 03:41:12 +0000 (16:41 +1300)

Trivial merge