From: Bernd Zeimetz <bernd@bzed.de>
Date: Thu, 1 Oct 2015 12:40:00 +0000 (+0200)
Subject: Merge branch 'master' into jessie-backports
X-Git-Tag: collectd-5.5.0-3_bpo8+1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ad068f9065d575cf0e15da408e072ceca361d001;p=pkg-collectd.git

Merge branch 'master' into jessie-backports
---

c125fa2c328f9a8d0c6f5132e4ca640d03dff8b9
diff --cc debian/changelog
index c436161,1e4071c..5ecb0fe
--- a/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