Merge version 134+rpi1 and 135 to produce 135+rpi1

diff --cc debian/changelog
index 4515decbb6078f526915ec0a310feb75d3bbe8f6,2dab72cefc8c15aaab660cdb1faeb8dee7b12c6a..5b445fc20e7da02ffee9392246874689350e1f37
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,11 +1,19 @@@
- partman-basicfilesystems (134+rpi1) buster-staging; urgency=medium
++partman-basicfilesystems (135+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 97+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 31 Jul 2014 21:59:02 +0000]
 +  * Remove fat-modules and ext2-modules dependencies as Raspbian
 +    kernels have the support built in.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sun, 07 Jan 2018 18:05:57 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 22 Jan 2018 03:11:52 +0000
++
+ partman-basicfilesystems (135) unstable; urgency=medium
+ 
+   [ Updated translations ]
+   * Icelandic (is.po) by Sveinn í Felli
+   * Panjabi (pa.po) by Aman ALam
+   * Serbian (sr.po) by Filipovic Dragan
+ 
+  -- Christian Perrier <bubulle@debian.org>  Sat, 13 Jan 2018 18:40:05 +0100
  
  partman-basicfilesystems (134) unstable; urgency=medium