[Pkg-cli-apps-commits] [SCM] Tomboy - desktop note taking program using Wiki style links branch, ubuntu, updated. debian/1.11.1-1ubuntu1

[Iain Lane]

The following commit has been merged in the ubuntu branch:
commit c6f1ffe35fad362e6244deaa2d53a7b74c4ca8b9
Author: Iain Lane <laney at debian.org>
Date:   Wed Mar 28 11:31:59 2012 +0100

    Stable release; update gbp.conf branches
    
    Conflicts:
    
    	debian/gbp.conf

diff --git a/debian/gbp.conf b/debian/gbp.conf
index a716ccb..821625e 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,4 +1,4 @@
 [DEFAULT]
 debian-branch = ubuntu
-upstream-branch = upstream-experimental
+upstream-branch = upstream
 compression = xz

-- 
Tomboy - desktop note taking program using Wiki style links