merge
authorx2000habouzit <x2000habouzit@839d8a87-29fc-0310-9880-83ba4fa771e5>
Mon, 18 Sep 2006 20:13:11 +0000 (20:13 +0000)
committerx2000habouzit <x2000habouzit@839d8a87-29fc-0310-9880-83ba4fa771e5>
Mon, 18 Sep 2006 20:13:11 +0000 (20:13 +0000)
commit374487239a72c7b2a083c5b9d8f2a53aec74ac80
tree72dd92e40f2c8b9e4934b167a8b9bba48c910476
parentd083f500e283a6abfcbac69d85ca8bd9892d7742
merge

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@861 839d8a87-29fc-0310-9880-83ba4fa771e5
modules/auth/auth.inc.php