merge patch
authorx2000habouzit <x2000habouzit@839d8a87-29fc-0310-9880-83ba4fa771e5>
Mon, 24 Oct 2005 08:43:25 +0000 (08:43 +0000)
committerx2000habouzit <x2000habouzit@839d8a87-29fc-0310-9880-83ba4fa771e5>
Mon, 24 Oct 2005 08:43:25 +0000 (08:43 +0000)
commit16d3931a2d6cf12b81d1698e6024c16599057c1b
tree9f05ad6bedaa5b14eeb52df43f31f58abd790284
parent9e58f667abdaacefdee78ab961e3a4fd78dea0ac
merge patch

git-svn-id: svn+ssh://murphy/home/svn/platal/branches/platal-0.9.8@135 839d8a87-29fc-0310-9880-83ba4fa771e5
templates/xnet/groupe/asso.tpl