Merge version 130+rpi1 and 131 to produce 131+rpi1

diff --cc debian/changelog
index 27fb8868ce492263c0629a4ac91b450e3981c9f0,848617ea20343985b570ece676b582a2911af077..b01dbfe953413f20a3fb15a94433fea8e7574e15
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,17 @@@
- partman-basicfilesystems (130+rpi1) buster-staging; urgency=medium
++partman-basicfilesystems (131+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>  Thu, 19 Oct 2017 20:27:49 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 05 Nov 2017 14:36:17 +0000
++
+ partman-basicfilesystems (131) unstable; urgency=medium
+ 
+   [ Updated translations ]
+   * Panjabi (pa.po) by A S Alam
+ 
+  -- Christian Perrier <bubulle@debian.org>  Tue, 31 Oct 2017 09:48:09 +0100
  
  partman-basicfilesystems (130) unstable; urgency=medium