From: Bdale Garbee <bdale@gag.com>
Date: Tue, 11 Jun 2013 14:48:11 +0000 (-0600)
Subject: Merge tag 'upstream/1.6'
X-Git-Tag: debian/1.6-1~14
X-Git-Url: https://git.gag.com/?p=debian%2Fgzip;a=commitdiff_plain;h=d738e90e8360e101b94fca8c79147f59565f62d8

Merge tag 'upstream/1.6'

Upstream version 1.6

Conflicts:
	gzip.1
	gzip.c
	zdiff.1
---

d738e90e8360e101b94fca8c79147f59565f62d8