Merge branch 'debian' into wheezy

Conflicts:
	debian/changelog

diff --cc debian/changelog
index d1f07c5845cd6e04dd8506431dcb0552c196274d,d4c1bc246f7cc932e626f5c4bb5fb9158bbc6abf..06c23b7c71b21f51f4c6dba6d0da028e38963aac
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,21 @@@
++openrocket (13.11.1~bpo60+1) wheezy-backports; urgency=low
++
++  * new upstream version released, update package to trigger user updates
++
++ -- Bdale Garbee <bdale@gag.com>  Sun, 10 Nov 2013 10:44:55 -0800
++
+ openrocket (13.11.1) unstable; urgency=low
+ 
+   * new upstream version released, update package to trigger user updates
+ 
+  -- Bdale Garbee <bdale@gag.com>  Sun, 10 Nov 2013 10:21:26 -0800
+ 
 +openrocket (13.09.1~bpo60+1) wheezy-backports; urgency=low
 +
 +  * new upstream version released, update package to trigger user updates
 +
 + -- Bdale Garbee <bdale@gag.com>  Sun, 08 Sep 2013 15:07:25 -0600
 +
  openrocket (13.09.1) unstable; urgency=low
  
    * new upstream version released, update package to trigger user updates

diff --cc debian/gbp.conf
index 0000000000000000000000000000000000000000,88406753d59abe93e4a81f36c0fdc36eaf754bb0..191c3a522588673be33cf6e4cc133f0af8783dde
mode 000000,100644..100644
--- /dev/null
--- 2/debian/gbp.conf
+++ b/debian/gbp.conf
@@@ -1,0 -1,2 +1,2 @@@
 -debian-branch = debian
+ [DEFAULT]
++debian-branch = wheezy