[Dctrl-tools-devel] [SCM] Debian control file query tools branch, maint-2.20, updated. 2.20-15-g952ecbf

[David Prévot]

The following commit has been merged in the maint-2.20 branch:
commit 9d97707da2ac296af357cf0e70317871ca9ebd3c
Merge: 694d15fac30ea0bf668943476f677efd353869ea dba260b2ba63bd4f75426a20545691d1e0dba6d6
Author: David Prévot <taffit at debian.org>
Date:   Wed Dec 7 16:47:23 2011 -0400

    Merge branch 'master' into maint-2.20
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index c74a33e,8cd694d..5cf885c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,11 +1,11 @@@
 -dctrl-tools (2.21) UNRELEASED; urgency=low
 +dctrl-tools (2.20.1) UNRELEASED; urgency=low
  
    [ David Prévot ]
    * Initial German manpages translation, thanks to Chris Leick (closes:
      #651218).
+   * man pages order in SEE ALSO, thanks to Chris Leick (closes: #651219).
  
-  -- Antti-Juhani Kaijanaho <ajk at debian.org>  Wed, 07 Dec 2011 18:10:16 +0200
+  -- David Prévot <taffit at debian.org>  Wed, 07 Dec 2011 11:56:51 -0400
  
  dctrl-tools (2.20) unstable; urgency=low
  

-- 
Debian control file query tools