Merge version 95+rpi1 and 96 to produce 96+rpi1

diff --cc debian/changelog
index 33e449aea8f62d2945a8a665d0e1f4899e64adfb,a1997dbbfb6b58cbdcf07cf32d9f9396f36cf93c..e9a3d095762b07126bd260ffdcd687ce5f214bc9
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,16 @@@
- partman-ext3 (95+rpi1) buster-staging; urgency=medium
++partman-ext3 (96+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 82+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 23 Mar 2014 13:52:02 +0000]
 +  * Remove ext4-modules dependency as raspbian kernels have it built-in.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 22 Jan 2018 03:27:18 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 01 Feb 2018 18:59:56 +0000
++
+ partman-ext3 (96) unstable; urgency=medium
+ 
+   [ Updated translations ]
+   * Tajik (tg.po) by Victor Ibragimov
+ 
+  -- Christian Perrier <bubulle@debian.org>  Wed, 24 Jan 2018 07:14:57 +0100
  
  partman-ext3 (95) unstable; urgency=medium