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)
1  2 
modules/admin.php

Simple merge