Merge branch 'master_MDL-28311' of git://github.com/danmarsden/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 8 Aug 2011 07:05:56 +0000 (15:05 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 8 Aug 2011 07:05:56 +0000 (15:05 +0800)

Trivial merge