Merge branch 'sb/archive-zip-double-assignment-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 19 Jul 2013 17:40:53 +0000 (10:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Jul 2013 17:40:53 +0000 (10:40 -0700)
* sb/archive-zip-double-assignment-fix:
archive-zip:write_zip_entry: Remove second reset of size variable to zero.

1  2 
archive-zip.c
diff --cc archive-zip.c
Simple merge