Merge commit 'origin/master' into fusionax
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 10 Aug 2008 12:39:23 +0000 (14:39 +0200)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 10 Aug 2008 12:39:23 +0000 (14:39 +0200)
commit2b921a8064ea14cd554f03e5f561eb98e79a9246
tree319dbc67bf35d78d8e2b64389fd398fefae38b30
parentd8782f1840cd354cb4c54cf1751160f6aadf502c
parent38acbdf38b39eb01fda9adae66058d9601fb2939
Merge commit 'origin/master' into fusionax

Conflicts:

htdocs/xorg.php
templates/profile/general.tpl

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
14 files changed:
htdocs/xorg.php
modules/email.php
modules/geoloc.php
modules/marketing.php
modules/profile.php
modules/search.php
modules/search/classes.inc.php
modules/search/search.inc.php
templates/emails/redirect.tpl
templates/gadgets/ig-minifiche.tpl
templates/include/plview.trombi.tpl
templates/marketing/private.tpl
templates/profile/general.tpl
templates/search/adv.form.tpl