[MERGE] forward port of branch 8.0 up to 0c3cd7cb

2016-07-08 16:32:10 +02:00
parent 4bf9622901 0c3cd7cbb4
commit 5949eedfdb
190 changed files with 15896 additions and 5768 deletions
@@ -146,7 +146,7 @@ setup(
        'psycopg2 >= 2.2',
        'python-chart',
        'pydot',
-        'pyparsing < 2',
+        'pyparsing',
        'pypdf',
        'pyserial',
        'python-dateutil',