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)
commit8b5bab6f91b42ab537503bafe27eeb7ddac7ef63
treea4f8e2f6770de88c92f20f15402e511374edf695
parent633a5edd515f6d80e61bbef0e3cb57bd8333a84b
parent1d16e927007f93816d266fbbcacd6b5bd157c56b
Merge branch 'w36_MDL-29292_m22_featuretypo' of git://github.com/skodak/moodle