Merge remote-tracking branch 'odoo/7.0' into 7.0

[odoo/odoo.git] / setup.py

diff --git a/setup.py b/setup.py
old mode 100755 (executable)
new mode 100644 (file)
index ae349d4..9dc814d
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
@@ -132,7 +131,7 @@ setuptools.setup(
           'python-ldap', # optional
           'python-openid',
           'pytz',
-          'pywebdav',
+          'pywebdav < 0.9.8',
           'pyyaml',
           'reportlab', # windows binary pypi.python.org/pypi/reportlab
           'simplejson',