Merge branch 'snapshot-fixes'

diff --cc tests/t0107-snapshot.sh
index c42091a2cf8544a6f42d5378f6096f5a2af77e9d,5f1b862ea9c1f4a879ef6767d5b90ae6479546fc..8ab4912a282b667fb19779138c7fe739acdfc321
--- 1/tests/t0107-snapshot.sh
--- 2/tests/t0107-snapshot.sh
+++ b/tests/t0107-snapshot.sh
@@@ -10,10 -10,10 +10,10 @@@ run_test 'get foo/snapshot/master.tar.g
  
  run_test 'check html headers' '
        head -n 1 trash/tmp |
 -           grep -e "Content-Type: application/x-tar" &&
 +           grep -e "Content-Type: application/x-gzip" &&
  
        head -n 2 trash/tmp |
-            grep -e "Content-Disposition: inline; filename=.test.tar.gz."
+            grep -e "Content-Disposition: inline; filename=.master.tar.gz."
  '
  
  run_test 'strip off the header lines' '

diff --cc ui-snapshot.c
Simple merge