Merge branch 'master' into trusty-ppa

diff --cc debian/changelog
index 02963884bf4b2373b5f4cb6440b482e3ea3def8e,d9edf57b14cc2c39bb16f6f6ee5b7e6e12f52640..4fb523fa75303e83c2f8d18c07f736b8d0321a23
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,30 +1,40 @@@
+ collectd (5.5.1-1) unstable; urgency=medium
+ 
+   * New upstream release:
+     - The "LC_NUMERIC" locale is now forced to "C", preventing problems on
+       environments where the locale uses a comma as decimal separator. Thanks
+       to Hubert Jarosz for reporting this (Closes: #799289).
+     - Fixed FTBFS with GCC 6.0; thanks to Martin Michlmayr for reporting this
+       (Closes: #811580).
+   * debian/patches:
+     - Removed bts802249_varnish_41.patch; implemented upstream.
+   * debian/collectd.conf:
+     - Sync with upstream changes since 5.5.0.
+ 
+  -- Marc Fournier <marc@bl.uem.li>  Fri, 22 Jan 2016 16:53:49 +0100
+ 
+ collectd (5.5.0-4) unstable; urgency=medium
+ 
+   * debian/collectd-core.overrides:
+     - Update 'binary-or-shlib-defines-rpath' lintian override.
+   * debian/rules:
+     - Strip out non-deterministic bits out of generated jar files.
+     - Remove RTLD_GLOBAL workaround, which was fixed upstream.
+   * debian/patches:
+     - Add bts802249_varnish_41.patch (Closes: #802249)
+ 
+  -- Marc Fournier <marc@bl.uem.li>  Mon, 16 Nov 2015 21:03:31 +0100
+ 
 +collectd (5.5.0-3ubuntu0~ppa14.04.1) trusty; urgency=medium
 +
 +  * Rebuild for trusty PPA.
 +  * debian/rules, debian/control:
 +    - remove references to systemd and strip-nondeterminism, which aren't
 +      available in trusty.
 +    - adjust libprotobuf build-dependency name.
 +
 + -- Marc Fournier <marc@bl.uem.li>  Fri, 09 Oct 2015 22:33:04 +0200
 +
  collectd (5.5.0-3) unstable; urgency=medium
  
    * debian/rules, debian/control:

diff --cc debian/rules
Simple merge