Merge branch 'w32_MDL-41002_m26_enroltypo' of https://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 6 Aug 2013 04:55:48 +0000 (16:55 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 6 Aug 2013 04:55:48 +0000 (16:55 +1200)
commit5261f26e0e61be1bfb267f1405603205d15016ca
tree146abe4b5c31c3515bd120f964b3f6dbca758831
parent87934924be2b35383982bcfaf41e4e566564de69
parent529342bb9f2e72693d3607b6f0ab58e12f18a7b5
Merge branch 'w32_MDL-41002_m26_enroltypo' of https://github.com/skodak/moodle