[SCM] Git repository for devscripts branch, master, updated. v2.12.4-116-g24c5a02

[James McCoy]

The following commit has been merged in the master branch:
commit 97d0f555e9b81c14fe8202891b75799320ef4668
Author: James McCoy <jamessan at debian.org>
Date:   Wed Dec 19 22:41:48 2012 -0500

    wrap-and-sort: Fix repeated word in man page.
    
    Closes: #696363
    Signed-off-by: James McCoy <jamessan at debian.org>

diff --git a/debian/changelog b/debian/changelog
index a587d22..b0bce2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ devscripts (2.12.6+exp1) UNRELEASED; urgency=low
       #695613)
   * dscverify: Use "gpg --status-fd" to determine if a valid signature is
     found and only use the signed content.  (Closes: #695914)
+  * wrap-and-sort: Fix repeated word in man page.  (Closes: #696363)
 
   [ Dmitry Smirnov ]
   * licensecheck: Remove any regular comments pattern. (Closes: #526698)
diff --git a/doc/wrap-and-sort.1 b/doc/wrap-and-sort.1
index f7e6252..f277ff0 100644
--- a/doc/wrap-and-sort.1
+++ b/doc/wrap-and-sort.1
@@ -37,8 +37,7 @@ Show this help message and exit.
 .TP
 \fB\-a\fR, \fB\-\-wrap\-always\fR
 Wrap all package lists in the Debian \fIcontrol\fR file
-even if the entries are shorter than 80 characters and could fit in one line
-line.
+even if the entries are shorter than 80 characters and could fit in one line.
 .TP
 \fB\-s\fR, \fB\-\-short\-indent\fR
 Only indent wrapped lines by one space (default is in\-line with the

-- 
Git repository for devscripts