Merge branch 'w40_MDL-31437_m24_cohortsync' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Oct 2012 20:00:12 +0000 (22:00 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Oct 2012 20:00:12 +0000 (22:00 +0200)
commitc740703c188b94afef1e66e37f51491aa9ac152b
tree51598fd8b915902703a2c297b1e0a8b62b9a54a0
parent60e5d95a317b03cf20bedd1ad1676f2eb8c9f72c
parent7881024ec4df4c888cd0d9fef0ff00493f37c2b9
Merge branch 'w40_MDL-31437_m24_cohortsync' of git://github.com/skodak/moodle

Conflicts:
lib/upgrade.txt
enrol/locallib.php
group/lib.php
lib/upgrade.txt