Merge commit 'origin/master' into fusionax
authorStéphane Jacob <jacou@melix.net>
Sat, 13 Dec 2008 17:03:01 +0000 (18:03 +0100)
committerStéphane Jacob <jacou@melix.net>
Sat, 13 Dec 2008 17:03:01 +0000 (18:03 +0100)
commit79414508519eab284fbf5093acf478a858a77ec9
tree48d157465813510b041c957ea8fcbca6d9d6ffb2
parent9937605f54403d10a23c1f42eda7cb3fe6f1557c
parent81d5d4d071a6172b36cefd4eefd4a1b941dc517e
Merge commit 'origin/master' into fusionax
ChangeLog
modules/admin.php
templates/admin/index.tpl