merge with master
authorPascal Corpet <pascal.corpet@m4x.org>
Tue, 22 Jul 2008 21:12:01 +0000 (23:12 +0200)
committerPascal Corpet <pascal.corpet@m4x.org>
Tue, 22 Jul 2008 21:12:01 +0000 (23:12 +0200)
commit7f12e3b4113791f3372f11572a205925d7bb6b97
tree3ab5e3704799bf5d22f1f5351b84e443ce226d71
parentcd5bd7dca7db6a980e6d3223aa5f43e0e1742acc
parente4501b5162ac1c70590205cc038db5d4b8188265
merge with master
24 files changed:
htdocs/css/default.css
htdocs/xorg.php
include/notifs.inc.php
include/user.func.inc.php
include/userset.inc.php
modules/email.php
modules/geoloc.php
modules/marketing.php
modules/payment/money/paypal.inc.php
modules/profile.php
modules/profile/addresses.inc.php
modules/profile/general.inc.php
modules/profile/jobs.inc.php
modules/profile/page.inc.php
modules/search.php
modules/search/classes.inc.php
templates/core/vcard.tpl
templates/emails/redirect.tpl
templates/include/minifiche.tpl
templates/include/plview.referent.tpl
templates/include/plview.trombi.tpl
templates/marketing/private.tpl
templates/profile/profile.tpl
templates/search/adv.form.tpl