Merge branch 'master' into 1.4-dev

This commit is contained in:
Mike Fährmann
2018-05-04 10:17:57 +02:00
17 changed files with 402 additions and 231 deletions

View File

@@ -6,4 +6,4 @@
# it under the terms of the GNU General Public License version 2 as
# published by the Free Software Foundation.
__version__ = "1.3.5-dev"
__version__ = "1.4.0-dev"