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

Trivial merge