merge
authorx2000habouzit <x2000habouzit@839d8a87-29fc-0310-9880-83ba4fa771e5>
Mon, 18 Sep 2006 19:42:40 +0000 (19:42 +0000)
committerx2000habouzit <x2000habouzit@839d8a87-29fc-0310-9880-83ba4fa771e5>
Mon, 18 Sep 2006 19:42:40 +0000 (19:42 +0000)
commita3eb0113794362498be38b1a42f65aa2bcdec2a1
tree6322764cff8d9fc95d825f1ddbe8bb76c3067595
parentd5a28192bf0d9857f2476daec3bb932dc3428683
merge

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