Merge tag 'upstream/1.5'
authorBdale Garbee <bdale@gag.com>
Tue, 19 Jun 2012 20:01:51 +0000 (14:01 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 19 Jun 2012 20:01:51 +0000 (14:01 -0600)
Upstream version 1.5

Conflicts:
deflate.c
gzip.1
gzip.c
gzip.doc
lib/getdtablesize.c
lib/sys_stat.in.h
m4/getdtablesize.m4
zless.in


No differences found