Merge branch 'MDL-28724' of git://github.com/nebgor/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 12 Sep 2011 05:24:49 +0000 (17:24 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 12 Sep 2011 05:24:49 +0000 (17:24 +1200)

Trivial merge