Merge branch 'MDL-26953' of git://github.com/lazydaisy/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 17 Oct 2011 04:37:49 +0000 (17:37 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 17 Oct 2011 04:37:49 +0000 (17:37 +1300)

Trivial merge