Merge remote branch 'origin/platal-1.0.1'
authorStéphane Jacob <sj@m4x.org>
Tue, 2 Nov 2010 21:46:27 +0000 (22:46 +0100)
committerStéphane Jacob <sj@m4x.org>
Tue, 2 Nov 2010 21:46:27 +0000 (22:46 +0100)
commit3422f7193e38e67054d2ecda2f4a68b64bd310ef
treebd120ac0447000f56f37aa4872af475feda8171a
parentb172472d39d29ece2ba112da94326cdfb6dbbd9d
parent0db1ca6d10e68811e0750e42c531aa161bf04965
Merge remote branch 'origin/platal-1.0.1'
modules/admin.php