merge fixes.
authorx2000habouzit <x2000habouzit@839d8a87-29fc-0310-9880-83ba4fa771e5>
Sat, 7 Oct 2006 08:45:57 +0000 (08:45 +0000)
committerx2000habouzit <x2000habouzit@839d8a87-29fc-0310-9880-83ba4fa771e5>
Sat, 7 Oct 2006 08:45:57 +0000 (08:45 +0000)
commite979cd2ba652fde2aaf5f8215ca52aef993d51e1
tree4d7da8508e60e5d79cb2d44b86d1e28c7667cb4f
parent7192cdc512c54b21c71c9fc879a5ce39716ffa75
merge fixes.

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@952 839d8a87-29fc-0310-9880-83ba4fa771e5
classes/platal.php
templates/xnetevents/admin.tpl