[SCM] Quake 3 engine branch, master, updated. debian/1.36+svn2131-1-15-gf65aa1a

[Simon McVittie]

The following commit has been merged in the master branch:
commit fdd9f457f8e640e24ac35e89559050e48a9ba3a5
Author: Simon McVittie <smcv at debian.org>
Date:   Mon Nov 28 20:46:00 2011 +0000

    Back to unstable

diff --git a/debian/changelog b/debian/changelog
index 845e57f..7184bd8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ ioquake3 (1.36+svn2202-1) UNRELEASED; urgency=low
   * New upstream snapshot
   * Update description: Debian's openarena now uses this shared engine
     (Closes: #644577)
+  * Back to unstable
 
  -- Simon McVittie <smcv at debian.org>  Wed, 12 Oct 2011 10:14:26 +0100
 
diff --git a/debian/gbp.conf b/debian/gbp.conf
index d7b98f0..efba884 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,4 +1,4 @@
 [DEFAULT]
-debian-branch = debian-experimental
+debian-branch = master
 upstream-branch = upstream
 pristine-tar = True

-- 
Quake 3 engine