]> git.cworth.org Git - tar/commit - m4/po.m4
Merge branch 'upstream' into dfsg-orig
authorBdale Garbee <bdale@gag.com>
Thu, 18 Jun 2009 20:36:43 +0000 (14:36 -0600)
committerBdale Garbee <bdale@gag.com>
Thu, 18 Jun 2009 20:36:43 +0000 (14:36 -0600)
commit9fb70f2dfbea87fd0a624a5addf03fcbafc9b48a
tree274f92ccebb20a4454ee3b530f9fbba1dbdcc722
parentc286dbf484dc985fb63d5c677fc8cd91b5b1d0f6
parent785cdec4450a1459fdbb90df1344b69be34e0059
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