Merge remote branch 'origin/platal-1.0.0'
authorStéphane Jacob <sj@m4x.org>
Tue, 20 Jul 2010 09:39:51 +0000 (11:39 +0200)
committerStéphane Jacob <sj@m4x.org>
Tue, 20 Jul 2010 09:39:51 +0000 (11:39 +0200)
1  2 
include/marketing.inc.php

Simple merge