Merge branch 'master' into jessie-backports

diff --cc debian/changelog
index c436161c94442f8b235756955eabc2b7d1cf4f34,1e4071c33f8a6b27c0622a5adf2b59ea8e54ffcb..5ecb0fe7b6acfbba2d196b2f4bc13365290c749a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,4 +1,11 @@@
- collectd (5.5.0-3~bpo8+1~conova) jessie-backports; urgency=medium
++collectd (5.5.0-3~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
-   * Set jessie-backports as gbp branch.
++  * Set jessie-backports as gbp branch. 
 +
-  -- Bernd Zeimetz <bzed@debian.org>  Thu, 10 Sep 2015 14:55:09 +0200
++ -- Bernd Zeimetz <bzed@debian.org>  Thu, 01 Oct 2015 14:39:43 +0200
 +
- collectd (5.5.0-3) UNRELEASED; urgency=medium
+ collectd (5.5.0-3) unstable; urgency=medium
  
    * debian/rules, debian/control:
      - Avoid hiding compiler options at build time, allowing the buildd log