Merge branch 'master_MDL-27404' of git://github.com/danmarsden/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 13 Jun 2011 06:53:37 +0000 (14:53 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 13 Jun 2011 06:53:37 +0000 (14:53 +0800)

Trivial merge