From: Christian Perrier <bubulle@debian.org>
Date: Thu, 6 Sep 2007 04:37:17 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.debian.org/git/dpkg/dpkg
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=227ecffffa426bdb71004003ca1ff51b73afd984;p=dpkg

Merge branch 'master' of ssh://git.debian.org/git/dpkg/dpkg

Conflicts:

	debian/changelog
---

227ecffffa426bdb71004003ca1ff51b73afd984
diff --cc debian/changelog
index 4e2c5081,5e62bbcf..eb8afc8f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -53,18 -71,15 +71,19 @@@ dpkg (1.14.6) unstable; urgency=lo
  
    [ Updated dpkg translations ]
    * Dzongkha (Tshewang Norbu). Closes: #430931
-   * Swedish (Peter Karlsson).
-   * Nepali (Shiva Prasad Pokharel). Closes: #435353, #437825
-   * Russian (Yuri Kozlov). Closes: #436147
-   * Polish (Robert Luberda).
-   * Vietnamese (Clytie Siddall). Closes: #440502
-   * German (Sven Joachim). Closes: #440537
    * French (Frédéric Bothamy).
++<<<<<<< HEAD:debian/changelog
 +  * Basque (Piarres Beobide). Closes: #440859
++=======
+   * Nepali (Shiva Prasad Pokharel). Closes: #435353
+   * Polish (Robert Luberda).
+   * Russian (Yuri Kozlov). Closes: #436147
+   * Swedish (Peter Karlsson).
++>>>>>>> 3f0020be7eac8357f5ce53f978b63f1fd4181be2:debian/changelog
  
    [ Updated dselect translations ]
-   * Swedish (Peter Karlsson).
    * Russian (Yuri Kozlov). Closes: #436149
+   * Swedish (Peter Karlsson).
  
    [ Updated man pages translations ]
    * German (Helge Kreutzmann).