[Dctrl-tools-devel] [SCM] Debian control file query tools branch, master, updated. 2.20-4-g26f2eaa

[Antti-Juhani Kaijanaho]

The following commit has been merged in the master branch:
commit 26f2eaac1977132fe7bf95587b321f5b865f25af
Merge: bdd64c65a866a82cf91b907c7568750aaba57571 5661b174d2a21055c84c1b34aaac3f82fd6c3b82
Author: Antti-Juhani Kaijanaho <ajk at debian.org>
Date:   Wed Dec 7 10:48:35 2011 +0200

    Merge branch 'master' of ssh://git.debian.org/git/collab-maint/dctrl-tools
    
    * 'master' of ssh://git.debian.org/git/collab-maint/dctrl-tools:
      po4a: POT and PO manpages update 331t 3f 3u
      Initial German manpages translation
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index 8dc1670,31a50f0..4f1b932
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,4 +1,12 @@@
 -dctrl-tools (2.20) UNRELEASED; urgency=low
 +dctrl-tools (2.21) UNRELEASED; urgency=low
 +
-   * 
++  [ David Prévot ]
++  * Initial German manpages translation, thanks to Chris Leick (closes:
++    #651218).
 +
 + -- Antti-Juhani Kaijanaho <ajk at debian.org>  Wed, 07 Dec 2011 10:46:50 +0200
 +
 +dctrl-tools (2.20) unstable; urgency=low
  
    * Improve the testsuite.
    * tester.sh: Do not output .differr if it wasn't constructed.
@@@ -17,7 -11,11 +19,7 @@@
      Closes: #641255 (grep-dctrl -c does not print out 0 when it should)
      [ Reported by Antti-Juhani Kaijanaho <ajk at debian.org> ]
  
 -  [ David Prévot ]
 -  * Initial German manpages translation, thanks to Chris Leick (closes:
 -    #651218).
 -
 - -- David Prévot <taffit at debian.org>  Tue, 06 Dec 2011 18:52:02 -0400
 + -- Antti-Juhani Kaijanaho <ajk at debian.org>  Sun, 27 Nov 2011 21:23:53 +0200
  
  dctrl-tools (2.19) unstable; urgency=low
  

-- 
Debian control file query tools