Merge branch 'MDL-28489_master' of git://github.com/stronk7/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 29 Aug 2011 23:03:38 +0000 (11:03 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 29 Aug 2011 23:03:38 +0000 (11:03 +1200)

Trivial merge