[SCM] ardour/master: Drop '-a4' suffix for branches

[umlaeute at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 5e63562e4111359940006267d65451e4a1c97bb9
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Thu Sep 10 21:06:44 2015 +0200

    Drop '-a4' suffix for branches

diff --git a/debian/gbp.conf b/debian/gbp.conf
index 77d4d33..79190a6 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,7 +1,5 @@
 [DEFAULT]
 pristine-tar = True
-upstream-branch = upstream-a4
-debian-branch = master-a4
 
 [import-orig]
 filter = waf

-- 
ardour Debian packaging