Merge commit 'origin/master' into fusionax
authorStéphane Jacob <sj@m4x.org>
Mon, 20 Jul 2009 20:54:14 +0000 (22:54 +0200)
committerStéphane Jacob <sj@m4x.org>
Mon, 20 Jul 2009 20:54:14 +0000 (22:54 +0200)
commit429e4a4b8eb428e9631513fc6bb053b4635c7729
tree8a085e7a47c262ced0e779f1165c2d27bbec4b11
parentb032b01b8919b36ec66f8a0395132953d8c01cf2
parenta10c5bd2db7188ce4680e71485a13b7d37eac84c
Merge commit 'origin/master' into fusionax
22 files changed:
ChangeLog
classes/user.php
classes/xnetpage.php
configs/platal.cron.in
htdocs/xorg.php
modules/admin.php
modules/email.php
modules/events.php
modules/newsletter.php
modules/profile.php
modules/profile/page.inc.php
modules/register.php
modules/search.php
modules/search/classes.inc.php
plugins/function.display_phones.php
templates/axletter/edit.tpl
templates/emails/redirect.tpl
templates/events/index.tpl
templates/include/minifiche.tpl
templates/profile/profile.tpl
templates/search/adv.form.tpl
templates/survey/show_root.tpl