[IMP]:marketing_campaign,document
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Wed, 6 Jun 2012 06:27:20 +0000 (11:57 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Wed, 6 Jun 2012 06:27:20 +0000 (11:57 +0530)
bzr revid: apa@tinyerp.com-20120606062720-85l1h6zcpi429f59


Trivial merge