Merge branch 'merge' into merge-all

attic/repository.py

@@ -3,6 +3,7 @@ from binascii import hexlify
 from itertools import islice
 import errno
 import os
+import shutil
 import struct
 import sys
 from zlib import crc32