Merge branch 'MDL-27636_master' of git://github.com/stronk7/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 30 May 2011 01:18:02 +0000 (09:18 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 30 May 2011 01:18:02 +0000 (09:18 +0800)

Trivial merge