Merge branch 'master' into 4.0-pre-not-stable

This commit is contained in:
Nico Schottelius 2014-01-20 14:58:55 +01:00
commit 295c21b4e9

1
.gitignore vendored
View file

@ -30,3 +30,4 @@ build
.lock-* .lock-*
.git-current-branch .git-current-branch
.lock* .lock*
.pypi-release