Merge version 1.184+rpi1 and 1.185 to produce 1.185+rpi1

diff --cc debian/changelog
index c3110e815c9676638880f991d1eff3781f93dd25,bd862146eff8de884ca39573ba9981dcce40e91e..a3c84d402d9e7264a167c195fa06b5f5f4589fb8
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,13 +1,20 @@@
- base-installer (1.184+rpi1) buster-staging; urgency=medium
++base-installer (1.185+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 1.148+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 30 Jul 2014 05:27:29 +0000]
 +  * Use raspbian-archive-keyring instead of debian-archive-keyring.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sun, 04 Nov 2018 12:21:55 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 31 Dec 2018 09:44:54 +0000
++
+ base-installer (1.185) unstable; urgency=medium
+   * Team upload
+ 
+   * Remove trailing whitespaces from changelog file, to fix lintian tag.
+ 
+   [ Updated translations ]
+   * Greek (el.po) by Vangelis Skarmoutsos
+   * Finnish (fi.po) by Juhani Numminen
+ 
+  -- Holger Wansing <hwansing@mailbox.org>  Tue, 25 Dec 2018 22:17:12 +0100
  
  base-installer (1.184) unstable; urgency=medium