From: Bdale Garbee <bdale@gag.com>
Date: Tue, 4 Aug 2009 18:15:20 +0000 (-0600)
Subject: Merge commit 'cworth/master' into dfsg-debian
X-Git-Tag: debian/1.22-2~3
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=5de13253a6452a29eedec21a53980febd6d3b2b9;hp=7fe46a80145ae05d42d0111fbbbacd2eb7dc0741;p=debian%2Ftar

Merge commit 'cworth/master' into dfsg-debian

Conflicts:
	debian/changelog
	debian/control
---

diff --git a/debian/control b/debian/control
index a7c674f7..0ea1746c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: tar
 Section: utils
 Priority: required
 Maintainer: Bdale Garbee <bdale@gag.com>
-Uploaders: Cark Worth <cworth@cworth.org>
+Uploaders: Carl Worth <cworth@cworth.org>
 Build-Depends: debhelper (>> 5), gettext, autoconf, autotools-dev
 Standards-Version: 3.8.0