Merge branch 'MDL-24684_master' of git://github.com/stronk7/moodle
authorSam Hemelryk <sam@moodle.com>
Thu, 30 Jun 2011 02:49:29 +0000 (10:49 +0800)
committerSam Hemelryk <sam@moodle.com>
Thu, 30 Jun 2011 02:49:29 +0000 (10:49 +0800)

Trivial merge