Merge branch 'master' into sid

diff --git a/debian/gbp.conf b/debian/gbp.conf
index dc23ff8dbfc8b6914a5e073f2c2da441e44a302c..93e84ee4f0ce457f85d716e608ca3d57f19462c7 100644 (file)
--- 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