Merge branch 'MDL-28587_master' of git://github.com/kordan/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 8 Aug 2011 05:43:42 +0000 (13:43 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 8 Aug 2011 05:43:42 +0000 (13:43 +0800)

Trivial merge