Merge branch 'rs/archive-zip-raw-compression'
commitf4e89b96d8fbc8735bcbb3bad3ad9bf3051b7c83
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Apr 2013 16:49:21 +0000 (22 09:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Apr 2013 16:49:21 +0000 (22 09:49 -0700)
tree78ac0a6a410b2a76db75477cb67c1fb2a39b35fe
parentad77690fe400d91d3da97e16c07f1a8591b19b99
parent7f49036f282ab345b5c60f36707175ab687d7e52
Merge branch 'rs/archive-zip-raw-compression'

* rs/archive-zip-raw-compression:
  zlib: fix compilation failures with Sun C Compilaer