[MERGE] merge with latest stable

[odoo/odoo.git] / addons / marketing_campaign_crm_demo / __init__.py

diff --git a/addons/marketing_campaign_crm_demo/__init__.py b/addons/marketing_campaign_crm_demo/__init__.py
old mode 100755 (executable)
new mode 100644 (file)
index e69de29..50a1411
--- a/addons/marketing_campaign_crm_demo/__init__.py
+++ b/addons/marketing_campaign_crm_demo/__init__.py
@@ -0,0 +1 @@
+# Debian packaging removes blank files, so this comment is added.