merge
authorx2000habouzit <x2000habouzit@839d8a87-29fc-0310-9880-83ba4fa771e5>
Mon, 17 Oct 2005 09:26:49 +0000 (09:26 +0000)
committerx2000habouzit <x2000habouzit@839d8a87-29fc-0310-9880-83ba4fa771e5>
Mon, 17 Oct 2005 09:26:49 +0000 (09:26 +0000)
commitb2e51acf9f69e5d3bc2eaca6f79f2c21578cf177
tree59157cbdd5e1b6f07bb9bfa84024cf543ab9a867
parentd9a33f98749460b66f1d282a29579dce540a459c
merge

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