[SCM] lives/master: work in master branch

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit e22049c8e754fe3b869b43702e4c44f67875fae0
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Apr 4 22:41:33 2014 -0400

    work in master branch

diff --git a/debian/gbp.conf b/debian/gbp.conf
index 8d0805b..622a90f 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,4 +1,4 @@
 [DEFAULT]
-debian-branch = multiarch
+debian-branch = master
 pristine-tar = True
 compression = bzip2

-- 
lives packaging