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)
commit7c4ae1c3d38d458ac3b6dea25ca76ebdd2c0ecd8
tree9b24f39350bfe03bfe2e00bcaf990ab09c47b10d
parentd47dcad7cd97a90d35bbf923764e7b8afe7e64bf
parent9707997cc3da1b0609b991b222bf1d12b52ebe72
Merge remote branch 'origin/platal-1.0.0'
include/marketing.inc.php