X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=debian%2Fchangelog;h=805dfbebcf3483c853f9a6e530ebd68d311b4e8b;hp=51b9adb294874fe316b2dd2ba84906944b731d68;hb=52a7a44f95fab091becece32a6995a409fd59fd1;hpb=45e5820959ae49256747cae78f0d18d0ca61bb06

diff --git a/debian/changelog b/debian/changelog
index 51b9adb..805dfbe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+nfs-utils (1:1.2.8-10) UNRELEASED; urgency=medium
+
+  [ Ben Hutchings ]
+  * Update debian/watch
+
+  [ Salvatore Bonaccorso ]
+  * Fix typo in comment for installed idmapd.conf.
+    Thanks to Ferenc Wágner (Closes: #841387)
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Mon, 23 Mar 2015 16:33:59 +0000
+
 nfs-utils (1:1.2.8-9.2) unstable; urgency=medium
 
   * Non-maintainer upload.
@@ -76,6 +87,7 @@ nfs-utils (1:1.2.8-9.1) unstable; urgency=medium
   * Drop obsolete versioned initscripts dependency. (Closes: #804990)
 
  -- Andreas Henriksson <andreas@fatal.se>  Tue, 28 Jun 2016 02:05:16 +0200
+>>>>>>> sid
 
 nfs-utils (1:1.2.8-9) unstable; urgency=medium