[MERGE] merge with latest stable

[odoo/odoo.git] / addons / fetchmail / __openerp__.py

diff --git a/addons/fetchmail/__openerp__.py b/addons/fetchmail/__openerp__.py
index 7fd52a7..29029d2 100644 (file)
--- a/addons/fetchmail/__openerp__.py
+++ b/addons/fetchmail/__openerp__.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #-*- coding:utf-8 -*-
 ##############################################################################
 #
@@ -7,16 +6,16 @@
 #    mga@tinyerp.com
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
+#    it under the terms of the GNU Affero General Public License as published by
 #    the Free Software Foundation, either version 3 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
+#    GNU Affero General Public License for more details.
 #
-#    You should have received a copy of the GNU General Public License
+#    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
@@ -24,16 +23,15 @@
 {
     "name" : "Fetchmail Server",
     "version" : "1.0",
-    "depends" : ["base"],
-    "author" : "Tiny",
-    "description": """Fetchail: 
+    "depends" : ["base", 'mail_gateway'],
+    "author" : "OpenERP SA",
+    "description": """Fetchmail: 
     * Fetch email from Pop / IMAP server
     * Support SSL
     * Integrated with all Modules
     * Automatic Email Receive
     * Email based Records (Add, Update)
     """,
-    'author': 'Tiny',
     'website': 'http://www.openerp.com',
     'init_xml': [],
     'update_xml': [
@@ -46,4 +44,5 @@
     ],
     'installable': True,
     'active': False,
+    'certificate' : '00692978332890137453',
 }