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)
Upstream version 1.6

Conflicts:
gzip.1
gzip.c
zdiff.1


No differences found