Merge branch 'w42_MDL-29688_m22_enrol' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 25 Oct 2011 01:02:20 +0000 (14:02 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 25 Oct 2011 01:02:20 +0000 (14:02 +1300)
commit44d10ad002096029a058e8b2b632621aa66d6d02
tree0721ee6bf6353801db6889a8cb6a74ba9249f86b
parent9d9d8e17ebe41979a55460380cee75e1c3ea7d9b
parent379434e4407d3467ea36ebc7fd307f4d9f5ad9b9
Merge branch 'w42_MDL-29688_m22_enrol' of git://github.com/skodak/moodle