Merge branch 'w33_MDL-29011_m22_nomanualenrol' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Aug 2011 21:12:34 +0000 (23:12 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Aug 2011 21:12:34 +0000 (23:12 +0200)
commit3a6cd081e41dff1bd214a1eab1097ba42c9a3008
tree25cfbf23449d4f1844e911c00a443978552290d3
parentd12d4d59a68aecb2fcdd092f22e5139538dd0d40
parent1e3c41c0cf81897bc612498452f0e7ba90ec6ee3
Merge branch 'w33_MDL-29011_m22_nomanualenrol' of git://github.com/skodak/moodle