Merge branch 'w31_MDL-27597_m22_catlike' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 10 Aug 2011 00:34:51 +0000 (02:34 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 10 Aug 2011 00:34:51 +0000 (02:34 +0200)
commit628e2396af98ec0fc1720057b63e977198ab1f2b
treee5faac4c137b44050183b91462cba69b9cb75d55
parent1ddecae7c78109386d7454b56c24922d5a256585
parent618a7f91ec4569095ef38f544c06ce72f0c921b7
Merge branch 'w31_MDL-27597_m22_catlike' of git://github.com/skodak/moodle