From a30101fd7e4f1982116dd30974916bb01a283521 Mon Sep 17 00:00:00 2001
From: Alexandre Fayolle <alexandre.fayolle@camptocamp.com>
Date: Mon, 2 Mar 2015 17:26:31 +0100
Subject: [PATCH] Add OCA as author of OCA addons

In order to get visibility on https://www.odoo.com/apps the OCA board has
decided to add the OCA as author of all the addons maintained as part of the
association.
---
 portal_partner_merge/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/portal_partner_merge/__openerp__.py b/portal_partner_merge/__openerp__.py
index b9848690f..e4c1fd87e 100644
--- a/portal_partner_merge/__openerp__.py
+++ b/portal_partner_merge/__openerp__.py
@@ -24,7 +24,7 @@
  'description': """
 Link module for base_partner_merge which extract portal dependency
  """,
- 'author': 'Camptocamp',
+ 'author': "Camptocamp,Odoo Community Association (OCA)",
  'maintainer': 'Camptocamp',
  'website': 'http://www.camptocamp.com/',
  'depends': ['portal', 'base_partner_merge'],