Merge branch 'MDL-26893' of git://github.com/lazydaisy/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 17 Oct 2011 00:54:03 +0000 (13:54 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 17 Oct 2011 00:54:03 +0000 (13:54 +1300)

Trivial merge