Merge branch 'MDL-27757-HEAD' of git://github.com/srynot4sale/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 13 Jun 2011 03:17:59 +0000 (11:17 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 13 Jun 2011 03:17:59 +0000 (11:17 +0800)

Trivial merge