Merge version 0.12.0-13+rpi1 and 0.12.0-14 to produce 0.12.0-14+rpi1

diff --cc debian/changelog
index f810bbb0b6bf021cffe2081c633d5f873b1bad7c,99efd74c2a41828de36d7c7f11cadb97b98a20ac..b8b6f2ed8152c77cbf46008edc237e74d8cb3dd7
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,11 +1,18 @@@
- libfm-qt (0.12.0-13+rpi1) buster-staging; urgency=medium
++libfm-qt (0.12.0-14+rpi1) buster-staging; urgency=medium
 +
++  [changes brought forward from 0.12.0-13+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 13 Dec 2017 01:52:52 +0000]
 +  * Add symbols file hack for Raspbian.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Wed, 13 Dec 2017 01:52:52 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 02 Jan 2018 07:09:46 +0000
++
+ libfm-qt (0.12.0-14) unstable; urgency=medium
+ 
+   * Bumped Standards to 4.1.2, no changes needed
+   * Removed branch from VCS fields
+   * Removed debian/gbp.conf
+   * Removed trailing whitespaces  
+ 
+  -- Alf Gaida <agaida@siduction.org>  Wed, 13 Dec 2017 20:08:02 +0100
  
  libfm-qt (0.12.0-13) unstable; urgency=medium