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

diff --cc debian/changelog
index 33e449aea8f62d2945a8a665d0e1f4899e64adfb,a8f67877e6a366b82a34e222ac323dfb1af2f785..464a06ee03840462f2b3b01eea75771d895c44d7
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,17 +1,24 @@@
- partman-ext3 (95+rpi1) buster-staging; urgency=medium
++partman-ext3 (97+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 Mar 2018 04:24:30 +0000
++
+ partman-ext3 (97) unstable; urgency=medium
+ 
+   [ Updated translations ]
+   * Norwegian Nynorsk (nn.po) by Alexander Jansen
+   * Tajik (tg.po) by Victor Ibragimov
+ 
+  -- Christian Perrier <bubulle@debian.org>  Mon, 19 Feb 2018 07:41:09 +0100
+ 
+ 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