Merge commit 'cworth/master' into dfsg-debian

Conflicts:
	debian/changelog
	debian/control

diff --git a/debian/control b/debian/control
index a7c674f7b2cfeaf1d3ff6e182d23b5f2b5e4e23e..0ea1746c4bd8d88de08c98a12a3f450f8b9be44a 100644 (file)
--- 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