Merge branch 'rs/zip-compresssed-size-with-export-subst' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 26 Mar 2013 19:43:49 +0000 (12:43 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 26 Mar 2013 19:43:49 +0000 (12:43 -0700)
When export-subst is used, "zip" output recorded incorrect
size of the file.

* rs/zip-compresssed-size-with-export-subst:
  archive-zip: fix compressed size for stored export-subst files


Trivial merge