Merge branch 'w34_MDL-34864_m24_enrolcat' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 21 Aug 2012 23:58:13 +0000 (01:58 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 21 Aug 2012 23:58:13 +0000 (01:58 +0200)
commita477affda0fbbe7b222fff98a965ccfa098ae6be
tree45229d33e87ea8424de87afb04c7de6ed757c1bc
parent41624a5682a88c1fdcb23dc8ceb0c4c5dce4560e
parent8d9b8a489471a33c26d81a556aafca4f554d82c7
Merge branch 'w34_MDL-34864_m24_enrolcat' of git://github.com/skodak/moodle