Merge commit 'origin/master' into fusionax
authorStéphane Jacob <sj@m4x.org>
Fri, 13 Nov 2009 19:24:01 +0000 (20:24 +0100)
committerStéphane Jacob <sj@m4x.org>
Fri, 13 Nov 2009 19:24:01 +0000 (20:24 +0100)
commitee71865181e96e7b0754ef9e7da4b3cb26f4c1d7
tree21c1438a3f905eed45e14c44a82871f7cea34f8e
parent1dc71da137a384e771723b8a893539a7f5cc9fab
parentbe719660db2aa5d78e8cf3d83163a561eaab222d
Merge commit 'origin/master' into fusionax
17 files changed:
ChangeLog
bin/cron/checkdb.php
classes/xnetpage.php
configs/platal.ini
include/notifs.inc.php
include/user.func.inc.php
include/userset.inc.php
modules/admin.php
modules/email.php
modules/events.php
modules/newsletter.php
modules/profile.php
modules/register.php
modules/search.php
modules/search/classes.inc.php
modules/search/search.inc.php
templates/survey/show_root.tpl