Merge branch 'w29_MDL-28440_m22_jssemicol' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 25 Jul 2011 01:44:25 +0000 (09:44 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 25 Jul 2011 01:44:25 +0000 (09:44 +0800)

Trivial merge