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

diff --cc debian/changelog
index 5b445fc20e7da02ffee9392246874689350e1f37,3d54a3ca581b490c3460dd5ccff0db91a457e02c..865d433275fd8036c857f1ea5967f3f19c33acee
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,11 +1,19 @@@
- partman-basicfilesystems (135+rpi1) buster-staging; urgency=medium
++partman-basicfilesystems (136+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>  Mon, 22 Jan 2018 03:11:52 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 01 Feb 2018 18:53:35 +0000
++
+ partman-basicfilesystems (136) unstable; urgency=medium
+ 
+   [ Updated translations ]
+   * Persian (fa.po) by nima sahraneshin
+   * Indonesian (id.po) by Al Qalit
+   * Tajik (tg.po) by Victor Ibragimov
+ 
+  -- Christian Perrier <bubulle@debian.org>  Tue, 23 Jan 2018 06:51:12 +0100
  
  partman-basicfilesystems (135) unstable; urgency=medium