From: Raspbian forward pporter <root@raspbian.org>
Date: Mon, 22 Jan 2018 03:11:52 +0000 (+0000)
Subject: Merge version 134+rpi1 and 135 to produce 135+rpi1
X-Git-Tag: archive/raspbian/135+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e4b8c624e491ac779aab7c0bbb3f92484c55b644;p=partman-basicfilesystems.git

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

e4b8c624e491ac779aab7c0bbb3f92484c55b644
diff --cc debian/changelog
index 4515dec,2dab72c..5b445fc
--- a/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