Merge commit 'origin/platal-0.9.17'
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 27 Jul 2008 20:01:53 +0000 (22:01 +0200)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 27 Jul 2008 20:01:53 +0000 (22:01 +0200)
commitd4775fe2dea4db5e6ca3db4a6034bb03a8b711cc
tree8ebeb21f56db70e645ff87d67b642ca4230e8ce2
parent8f201b6990b0799230f093920c68e651d040e03b
parent81bb9177e5d7eb74f8abeda97f1b5ec3b760b513
Merge commit 'origin/platal-0.9.17'

Conflicts:

modules/marketing.php

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
modules/marketing.php