From: Peter Karlsson <peter@softwolves.pp.se>
Date: Sun, 5 Aug 2007 20:29:21 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.debian.org/git/dpkg/dpkg into peterk-swedish-20070731
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=086325b3214da82c17d5b4cd6c0e79854f99039c;p=dpkg

Merge branch 'master' of ssh://git.debian.org/git/dpkg/dpkg into peterk-swedish-20070731

Conflicts:

	man/ChangeLog
---

086325b3214da82c17d5b4cd6c0e79854f99039c
diff --cc man/ChangeLog
index d787a56a,ebc610e4..7084659d
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@@ -1,7 -1,7 +1,11 @@@
 +2007-08-05  Peter Karlsson  <peterk@debian.org>
 +
 +	* po/sv.po: Updated to 1282t.
 +
+ 2007-08-05  Helge Kreutzmann  <debian@helgefjell.de>
+ 
+         * po/de.po: Updated to 1111t6f165u.
+ 
  2007-07-31  Peter Karlsson  <peterk@debian.org>
  
  	* po/sv.po, po/sv.add: Updated to 991t291u.