merges
authorx2000habouzit <x2000habouzit@839d8a87-29fc-0310-9880-83ba4fa771e5>
Mon, 9 Jan 2006 13:59:58 +0000 (13:59 +0000)
committerx2000habouzit <x2000habouzit@839d8a87-29fc-0310-9880-83ba4fa771e5>
Mon, 9 Jan 2006 13:59:58 +0000 (13:59 +0000)
commitbe007d27a6818165db7217fc67d73bf130f58c86
treef7234b2468c9c8f257abc5a05764ac0d77843971
parenta0e626796940404e063fb118a9116591753660ba
merges

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@199 839d8a87-29fc-0310-9880-83ba4fa771e5
htdocs.net/groupe/edit.php
htdocs.net/groupe/evenements.php
htdocs.net/groupe/evt-modif.php
htdocs/admin/utilisateurs.php
install.d/wiki/wiki.d/Site.EditQuickReference [new file with mode: 0644]