uncommited merge
authorx2000habouzit <x2000habouzit@839d8a87-29fc-0310-9880-83ba4fa771e5>
Sat, 25 Mar 2006 17:08:48 +0000 (17:08 +0000)
committerx2000habouzit <x2000habouzit@839d8a87-29fc-0310-9880-83ba4fa771e5>
Sat, 25 Mar 2006 17:08:48 +0000 (17:08 +0000)
commit024742bc7e4c48f15b9a7e0e42fe45af65129ee0
tree80b0478cda2c8d194e8f0f46f4e6dde7d43e29f6
parentfe380d44c07b9898506be06fcf9bb1368e8407b7
uncommited merge

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@270 839d8a87-29fc-0310-9880-83ba4fa771e5
htdocs/listes/admin.php