Merge branch 'w40_MDL-35701_m24_enroldb' of git://github.com/skodak/moodle
commit5a2c3743265d7d19aba4b9e4c3a721c2aa23c28e
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Oct 2012 19:27:55 +0000 (2 21:27 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Oct 2012 19:27:55 +0000 (2 21:27 +0200)
tree79c05247fc993bd772cbb3ecc8c8335faaa97d8b
parentf7a506fb87f4227047b99ab5fc5aba39e2807297
parentd156ec9ceaee5ca99c4fa218602cc58f6eef5301
Merge branch 'w40_MDL-35701_m24_enroldb' of git://github.com/skodak/moodle