Merge branch 'w38_MDL-29509_m22_admintool2' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Sep 2011 23:52:23 +0000 (01:52 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Sep 2011 23:52:23 +0000 (01:52 +0200)
commit01b4e0016146ab3de3f66350eb0ec21a33790246
tree84a69cb450bdd9519443556737d6091e069cbeea
parenta0688126355cc074e7ea287ef60808bf2aeabd0e
parent5e8cc8462bb95772d5b32453a89597827597ef51
Merge branch 'w38_MDL-29509_m22_admintool2' of git://github.com/skodak/moodle