Merge commit 'origin/master' into fusionax
authorVincent Zanotti <vincent.zanotti@polytechnique.org>
Sun, 19 Oct 2008 03:11:17 +0000 (05:11 +0200)
committerVincent Zanotti <vincent.zanotti@polytechnique.org>
Sun, 19 Oct 2008 03:11:17 +0000 (05:11 +0200)
commitacc9be56f2cc773f7e684f9cd3201141bc126ee2
treec54014089309caf2a3091ada38c0ec50c7b5772b
parentf875fdc7a9cd2b879598a1e0ac0cb73456e4e809
parent1f894f6db322b5143bb35146661b7c55a524abb1
Merge commit 'origin/master' into fusionax

Conflicts:
include/userset.inc.php
modules/email.php
templates/include/minifiche.tpl
templates/include/plview.trombi.tpl
templates/profile/profile.tpl

Signed-off-by: Vincent Zanotti <vincent.zanotti@polytechnique.org>
19 files changed:
ChangeLog
bin/cron/checkdb.php
include/emails.combobox.inc.php
include/user.func.inc.php
include/userset.inc.php
modules/email.php
modules/payment/money/paypal.inc.php
modules/profile.php
modules/search.php
modules/search/classes.inc.php
templates/emails/redirect.tpl
templates/events/index.tpl
templates/gadgets/ig-minifiche.tpl
templates/include/minifiche.tpl
templates/include/plview.referent.tpl
templates/include/plview.trombi.tpl
templates/marketing/private.tpl
templates/profile/general.tpl
templates/profile/profile.tpl