Merge branch 'MDL-27768' of git://github.com/lazydaisy/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 25 Jul 2011 01:39:31 +0000 (09:39 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 25 Jul 2011 01:39:31 +0000 (09:39 +0800)

Trivial merge