merge
authorx2000habouzit <x2000habouzit@839d8a87-29fc-0310-9880-83ba4fa771e5>
Thu, 9 Feb 2006 19:21:23 +0000 (19:21 +0000)
committerx2000habouzit <x2000habouzit@839d8a87-29fc-0310-9880-83ba4fa771e5>
Thu, 9 Feb 2006 19:21:23 +0000 (19:21 +0000)
commitcd3ddcf4eeb57cc56f932d98aace2956b0bb5f5e
treef43e37f67d8f7dec7454decfb166b24f76c27e85
parent3bc93b56b693f17b5b24b1f29931959e1667484a
merge

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@234 839d8a87-29fc-0310-9880-83ba4fa771e5
templates/search.tpl