Merge branch 'w35_MDL-35064_m24_delenrol' of git://github.com/skodak/moodle
authorAparup Banerjee <aparup@moodle.com>
Wed, 29 Aug 2012 05:46:04 +0000 (13:46 +0800)
committerAparup Banerjee <aparup@moodle.com>
Wed, 29 Aug 2012 05:46:04 +0000 (13:46 +0800)
commit8be5407bc12b83ab85c286a4da9c454a460ef126
tree3687b8eb2de2d9346c3a11c85a879dd0c90629ad
parent8df000885658947d08944920e4b6ad5ffad2da4c
parent5d605db1dcbe21712fb5d52a83248b39ab4d095d
Merge branch 'w35_MDL-35064_m24_delenrol' of git://github.com/skodak/moodle

Conflicts:
enrol/manual/locallib.php
enrol/manual/locallib.php