[SCM] gsequencer/master: fixed conflict for merge

[jkraehemann-guest at users.alioth.debian.org]

Merge branch 'master' of ssh://git.debian.org/git/pkg-multimedia/gsequencer
fixed copyright
added debian directory
fixed changelog version
added debian directory
updated to ags-0.4.2-62.tar.gz
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 6cf38024789be6b1a3ef814d7f2f41e4c507830d
X-Git-Newrev: ae0d565de3d52f06c9491a669df7011da96648f2

The following commit has been merged in the master branch:
commit ae0d565de3d52f06c9491a669df7011da96648f2
Merge: 1c69c171fc0756796edd93632c11fc28a156593b 6cf38024789be6b1a3ef814d7f2f41e4c507830d
Author: Joël Krähemann <jkraehemann at gmail.com>
Date:   Mon Jun 15 23:41:28 2015 +0200

    fixed conflict for merge


-- 
gsequencer packaging