merge master to features

2016-06-01 08:13:26 +02:00
parent 8c1be624a6 f423f08b45
commit b5bd4d959d
28 changed files with 262 additions and 119 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,7 @@ include/
 *.class
 *.orig
 *~
+.hypothesis/

 .eggs/