[SCM] snd/master: Ignore-merge branch 'master' into 'wheezy'

[umlaeute at users.alioth.debian.org]

Remove myself from the Uploaders field.
wrap-and-sort -a -s
enable parallel builds
easy building with source format 3.0
update debian/changelog
remove deleted files from branch
Don't hardcode list of non-Linux Architectures, Closes: #634762
start new upload
Update
Merge commit 'upstream/12.0'
Imported Upstream version 12.0
Merge commit 'upstream/11.10'
Imported Upstream version 11.10
Update versioned build-dep on libgtk2.0-dev.
Bump standards.
Update debian/changelog.
Refresh patches.
Update debian/gbp.conf file.
Merge commit 'upstream/11.9'
Imported Upstream version 11.9
Fix copyright information.
updated copyright file
Update debian/copyright.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 97f2e40d36c1eebe50a058c7f9b1f72bb18cf869
X-Git-Newrev: 64ad6cfc0cb281168a094e02e6fcdffc57577fda

The following commit has been merged in the master branch:
commit b378be31e5fdef1ba1cf978ab5e99223b7f4f91b
Merge: 9ba5d38f6d455ec667319c2228219e7cc0aabd3a 97f2e40d36c1eebe50a058c7f9b1f72bb18cf869
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Mon Jan 25 11:24:18 2016 +0100

    Ignore-merge branch 'master' into 'wheezy'
    
    not taking any changes from 'master', we are only getting rid of the 'wheezy' branch
    without losing history...

diff --combined debian/gbp.conf
index 978a872,0a3b09a..018c2fd
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@@ -1,4 -1,3 +1,4 @@@
  [DEFAULT]
 -sign-tags = True
  pristine-tar = True
- upstream-branch = upstream.wheezy
- debian-branch = wheezy
++#upstream-branch = upstream
++#debian-branch = master

-- 
snd packaging