[SCM] VLC media player packaging branch, master, updated. debian/1.1.2-1+exp1-20-g5fbcc5e

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 5fbcc5e9f43f801bd85571fc3b0ef4268bc50d0d
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Aug 20 11:04:33 2010 +0200

    update for new branch name

diff --git a/debian/gbp.conf b/debian/gbp.conf
index a005699..e5d6b5b 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,5 +1,5 @@
 [DEFAULT]
-debian-branch = experimental
+debian-branch = master
 pristine-tar = True
 compression = bzip2
 

-- 
VLC media player packaging