From: Marc Fournier <marc@bl.uem.li>
Date: Mon, 23 Jan 2017 19:48:23 +0000 (+0100)
Subject: Merge branch 'master' into sid
X-Git-Tag: collectd-5.7.1-1^0
X-Git-Url: https://git.tokkee.org/?p=pkg-collectd.git;a=commitdiff_plain;h=86468c27119e776a104594fdba88b3da254de205;hp=7ea55ea7453740246e34d83dbb80fc0fc92f4319

Merge branch 'master' into sid
---

diff --git a/debian/gbp.conf b/debian/gbp.conf
index dc23ff8..93e84ee 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,4 +1,5 @@
 # Configuration file for git-buildpackage and friends
 [DEFAULT]
 pristine-tar = True
+debian-branch = sid
 debian-tag = collectd-%(version)s