From: Bdale Garbee Date: Thu, 18 Jun 2009 20:36:43 +0000 (-0600) Subject: Merge branch 'upstream' into dfsg-orig X-Git-Url: https://git.cworth.org/git?p=tar;a=commitdiff_plain;h=9fb70f2dfbea87fd0a624a5addf03fcbafc9b48a Merge branch 'upstream' into dfsg-orig 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 --- 9fb70f2dfbea87fd0a624a5addf03fcbafc9b48a