From: Bdale Garbee <bdale@gag.com>
Date: Wed, 10 Nov 2010 22:41:01 +0000 (-0700)
Subject: Merge branch 'upstream' into dfsg-orig
X-Git-Tag: debian/1.25-1~4^2
X-Git-Url: https://git.gag.com/?p=debian%2Ftar;a=commitdiff_plain;h=84dd32d487759d017e068786160b5d1a0f1682e5

Merge branch 'upstream' into dfsg-orig

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

84dd32d487759d017e068786160b5d1a0f1682e5