From: Bdale Garbee <bdale@gag.com>
Date: Wed, 10 Mar 2010 16:34:07 +0000 (-0700)
Subject: Merge branch 'upstream' into dfsg-orig
X-Git-Tag: debian/1.23-1^2
X-Git-Url: https://git.gag.com/?p=debian%2Ftar;a=commitdiff_plain;h=29ece34f44a27750bbfd76154ad9882580453dc7

Merge branch 'upstream' into dfsg-orig

Conflicts:
	doc/Makefile.am
	doc/Makefile.in
	doc/genfile.texi
	doc/getdate.texi
	doc/snapshot.texi
	doc/sparse.texi
	doc/stamp-vti
	doc/tar-snapshot-edit.texi
	doc/tar.info
	doc/tar.info-1
	doc/tar.info-2
	doc/tar.texi
	doc/version.texi
---

29ece34f44a27750bbfd76154ad9882580453dc7