[SCM] tango branch, master, updated. debian/8.0.5+dfsg-1-1-g1dd4c13

[Picca Frédéric-Emma?==?UTF-8?Q?nuel]

The following commit has been merged in the master branch:
commit 9a0a53cf8cb202d4056e6089085783bdb9fd316f
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Sat Sep 22 08:19:57 2012 +0200

    we are working for the experimental branch

diff --git a/debian/gbp.conf b/debian/gbp.conf
index d68fcc5..dd7889c 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,6 +1,2 @@
-[git-import-orig]
-upstream-branch=upstream
-no-merge=1
-
-[git-buildpackage]
-upstream-branch=dfsg_clean
+[DEFAULT]
+debian-branch=experimental

-- 
TANGO distributed control system.