From: Raspbian forward pporter <root@raspbian.org>
Date: Sun, 7 Jan 2018 18:05:57 +0000 (+0000)
Subject: Merge version 133+rpi1 and 134 to produce 134+rpi1
X-Git-Tag: archive/raspbian/134+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=46b1e8e66d771861051817d58069817cbbeab225;p=partman-basicfilesystems.git

Merge version 133+rpi1 and 134 to produce 134+rpi1
---

46b1e8e66d771861051817d58069817cbbeab225
diff --cc debian/changelog
index d38ee26,e39d929..4515dec
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,17 @@@
- partman-basicfilesystems (133+rpi1) buster-staging; urgency=medium
++partman-basicfilesystems (134+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>  Sat, 09 Dec 2017 01:29:55 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 07 Jan 2018 18:05:57 +0000
++
+ partman-basicfilesystems (134) unstable; urgency=medium
+ 
+   [ Updated translations ]
+   * Nepali (ne.po) by Jeewal Kunwar
+ 
+  -- Christian Perrier <bubulle@debian.org>  Mon, 01 Jan 2018 09:17:06 +0100
  
  partman-basicfilesystems (133) unstable; urgency=medium