6 commits

Author	SHA1	Message	Date
Thomas Waldmann	045e5a1203	Merge branch 'master' into move-to-src	2016-05-30 19:38:16 +02:00
Marian Beermann	478a6f29b6	Lower PBKDF2 iteration count for the tests ... This cuts testing time to about one third for me.	2016-05-25 22:29:57 +02:00
Marian Beermann	4f1157c3a4	fix tox build for environment-python != containing-python in yet-another instance ... this instance: the repository worktree is *not* named borg.	2016-05-24 20:58:12 +02:00
Thomas Waldmann	24204b181b	remove conftest sys.path hack, fixes #1072 ... not needed any more as the code is now below src/.	2016-05-21 19:18:54 +02:00
Marian Beermann	43258abf21	Fix tox	2016-05-18 17:08:49 +02:00
Marian Beermann	805f63167c	Translate Linux fsflags to BSD flags and vice versa	2016-05-18 00:22:53 +02:00