Merge commit 'origin/fusionax' into account
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Tue, 30 Dec 2008 22:33:45 +0000 (23:33 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Tue, 30 Dec 2008 22:33:45 +0000 (23:33 +0100)
commit384712208a260ae1b5b7e90ac95f0df84ffbe8af
tree625c85db57db5686cf1492a8e4453c9f39baf98e
parent7f1ff426fc774ff5baedc4d76df5f6bced50b720
parent90862af65777b54eb2830b501729236fe50aa110
Merge commit 'origin/fusionax' into account

Conflicts:

classes/user.php

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
include/marketing.inc.php
include/user.func.inc.php