From: Bdale Garbee <bdale@gag.com>
Date: Wed, 25 Feb 2009 06:12:02 +0000 (-0700)
Subject: Merge branch 'upstream' into dfsg-orig, improve cleanup-script.sh
X-Git-Tag: debian/1.22-1~3^2~1
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=c286dbf484dc985fb63d5c677fc8cd91b5b1d0f6;hp=c286dbf484dc985fb63d5c677fc8cd91b5b1d0f6;p=debian%2Ftar

Merge branch 'upstream' into dfsg-orig, improve cleanup-script.sh

Conflicts:
	doc/Makefile.in
	doc/getdate.texi
	doc/stamp-vti
	doc/tar.info
	doc/tar.info-1
	doc/tar.info-2
	doc/tar.texi
	doc/version.texi
---