Merge branch 'MDL-28566' of git://github.com/lazydaisy/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 3 Oct 2011 01:37:35 +0000 (14:37 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 3 Oct 2011 01:37:35 +0000 (14:37 +1300)

Trivial merge