From: Raspbian forward pporter <root@raspbian.org>
Date: Sun, 5 Nov 2017 14:36:17 +0000 (+0000)
Subject: Merge version 130+rpi1 and 131 to produce 131+rpi1
X-Git-Tag: archive/raspbian/131+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=63b9a91ca68bae9223e2e44f5f3218083e2b5756;p=partman-basicfilesystems.git

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

63b9a91ca68bae9223e2e44f5f3218083e2b5756
diff --cc debian/changelog
index 27fb886,848617e..b01dbfe
--- a/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