merged master; fixed tests

This commit is contained in:
Christoph Oberhofer
2016-06-18 19:59:27 +02:00
17 changed files with 2819 additions and 1851 deletions
+644 -673
View File
File diff suppressed because it is too large Load Diff
+1 -1
View File
File diff suppressed because one or more lines are too long
+4 -4
View File
File diff suppressed because one or more lines are too long