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

Simple merge