Merge branch master into multiarch

Resolve accumulated conflicts. In particular webapp.py gained a few
non-trivial ones, such as changes in InternalRedirect or usage of
contextlib.closing.

Conflicts:
	schema.sql
	webapp.py

1 files changed, 1 insertions, 1 deletions

diff --git a/dedup/arreader.py b/dedup/arreader.py
index d74ae37..e53efd9 100644
--- a/dedup/arreader.py
+++ b/dedup/arreader.py
@@ -45,7 +45,7 @@ class ArReader(object):
         if not file_header:
             raise EOFError("end of archive found")
         parts = struct.unpack("16s 12s 6s 6s 8s 10s 2s", file_header)
-        parts = [p.rstrip(b" ") for p in parts]
+        parts = [p.rstrip(b"/ ") for p in parts]
         if parts.pop() != self.file_magic:
             raise ValueError("ar file header not found")
         self.remaining = int(parts[5])