Merge branch 'master_MDL-27947' of git://github.com/danmarsden/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 11 Jul 2011 03:31:13 +0000 (11:31 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 11 Jul 2011 03:31:13 +0000 (11:31 +0800)

Trivial merge