Merge branch 'em_MDL-26476_20_grp' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 18 Feb 2011 17:25:04 +0000 (18:25 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 18 Feb 2011 17:25:04 +0000 (18:25 +0100)
commitf5c452a3b342be92fd39aee6d56d44e4e2c82ec8
treeb85fc36e4f6ce6401bab0b7a4ef485a6f7e4af97
parent3b3e2cecf3a2f4d2130e4a675402e33a69cb5c61
parent12923c92b112680c17491aa62cfc4094485869f8
Merge branch 'em_MDL-26476_20_grp' of git://github.com/skodak/moodle