merge
authorx2000habouzit <x2000habouzit@839d8a87-29fc-0310-9880-83ba4fa771e5>
Mon, 18 Sep 2006 20:19:43 +0000 (20:19 +0000)
committerx2000habouzit <x2000habouzit@839d8a87-29fc-0310-9880-83ba4fa771e5>
Mon, 18 Sep 2006 20:19:43 +0000 (20:19 +0000)
commit27a62f07cced8bb8dc5babce1c49e7a8be21dd09
tree2a948b7474a2319960aba2b8b79738a7f0ff4313
parent374487239a72c7b2a083c5b9d8f2a53aec74ac80
merge

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