Merge branch 'w36_MDL-29292_m22_featuretypo' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 12 Sep 2011 03:17:08 +0000 (15:17 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 12 Sep 2011 03:17:08 +0000 (15:17 +1200)

Trivial merge