Merge commit 'origin/master' into fusionax
authorVincent Zanotti <vincent.zanotti@m4x.org>
Thu, 6 Aug 2009 17:11:55 +0000 (19:11 +0200)
committerVincent Zanotti <vincent.zanotti@m4x.org>
Thu, 6 Aug 2009 17:11:55 +0000 (19:11 +0200)
commit96d80a35f4abef2b94d2f2b8f5442230141398d1
treef39a57f4be8241a0c705b1e494d259cd032da976
parent8a43972f58f0a77015ae9e509f1c073d188874d2
parent06cf668601a11c0a4818012454414826b1013205
Merge commit 'origin/master' into fusionax

Conflicts:
templates/search/adv.form.tpl

Signed-off-by: Vincent Zanotti <vincent.zanotti@m4x.org>
modules/admin.php
templates/search/adv.form.tpl