Merge remote branch 'origin/platal-1.0.0'
authorStéphane Jacob <sj@m4x.org>
Sat, 17 Jul 2010 17:01:00 +0000 (19:01 +0200)
committerStéphane Jacob <sj@m4x.org>
Sat, 17 Jul 2010 17:01:00 +0000 (19:01 +0200)
commit3c696b26901e971c2a0f20dbdee3e7af49a576b6
treeb38bda311ddd44f75b63cc3064d8ccbe0cc06544
parent853c66f2ece0d459c74d33c37d2c94d8110aa774
parent1549059d07f3e752e52ad5d794648fd389170f94
Merge remote branch 'origin/platal-1.0.0'
modules/admin.php