From: Bdale Garbee <bdale@gag.com>
Date: Mon, 1 Nov 2010 23:22:36 +0000 (-0600)
Subject: Merge branch 'upstream' into dfsg-orig
X-Git-Tag: debian/1.24-1~1^2
X-Git-Url: https://git.gag.com/?p=debian%2Ftar;a=commitdiff_plain;h=b414e25de8ca49d7567a92c203d431383ec57c83

Merge branch 'upstream' into dfsg-orig

Conflicts:
	doc/Makefile.am
	doc/Makefile.in
	doc/dumpdir.texi
	doc/fdl.texi
	doc/gendocs_template
	doc/intern.texi
	doc/mastermenu.el
	doc/parse-datetime.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/value.texi
	doc/version.texi
---

b414e25de8ca49d7567a92c203d431383ec57c83