Thomas Waldmann 740312f725 Merge branch '1.0-maint' into merge-1.0-maint ... # Conflicts: # requirements.d/development.txt # tox.ini		2017-01-15 01:15:04 +01:00
..
attic.txt	move attic test dependency into own file	2016-06-21 20:06:36 +02:00
development.txt	Merge branch '1.0-maint' into merge-1.0-maint	2017-01-15 01:15:04 +01:00
fuse.txt	add comment about requiring llfuse, fixes #1726	2016-10-19 00:56:22 +02:00