Merge tag 'upstream/1.6'
authorBdale Garbee <bdale@gag.com>
Tue, 11 Jun 2013 14:48:11 +0000 (08:48 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 11 Jun 2013 14:48:11 +0000 (08:48 -0600)
commitd738e90e8360e101b94fca8c79147f59565f62d8
tree4d41fec112ce127a36c6afc6b63813468dd63a72
parentf277ee25feefa0c56bcc71d96d99a78a4c17bffb
parentd57728a6ca2413a7c564d8b7bb13d9e5a5a180f3
Merge tag 'upstream/1.6'

Upstream version 1.6

Conflicts:
gzip.1
gzip.c
zdiff.1
deflate.c
doc/gzip.texi
gzip.c
gzip.h
zdiff.1