Merge branch 'MDL-27966_master' of git://github.com/stronk7/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 22 Jun 2011 09:15:10 +0000 (17:15 +0800)
committerSam Hemelryk <sam@moodle.com>
Wed, 22 Jun 2011 09:15:10 +0000 (17:15 +0800)

Trivial merge