Merge commit 'origin/master' into fusionax
authorVincent Zanotti <vincent.zanotti@m4x.org>
Fri, 10 Apr 2009 17:00:59 +0000 (19:00 +0200)
committerVincent Zanotti <vincent.zanotti@m4x.org>
Fri, 10 Apr 2009 17:00:59 +0000 (19:00 +0200)
commitaef0283bdf24c94d640a16ccac08191980ae7a25
tree1c46116b976836d238ddeb8b98a6fffe066f12ee
parent4d336f59bad0da6714bc69fd71aa94056bc455c1
parentbf88be24007cb338b2d1be518e8ba65c929a010a
Merge commit 'origin/master' into fusionax

Conflicts:
modules/email.php

Signed-off-by: Vincent Zanotti <vincent.zanotti@m4x.org>
modules/admin.php
modules/email.php
modules/search/classes.inc.php