Merge branch 'MDL-27890_master' of git://github.com/stronk7/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 11 Jul 2011 03:25:21 +0000 (11:25 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 11 Jul 2011 03:25:21 +0000 (11:25 +0800)

Trivial merge