[SCM] gsequencer/master: Update upstream source from tag 'upstream/1.4.6'

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

New upstream version 1.4.6
merge conflict
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: cdadf60220ab3c2ee5e67a5158f120265200356f
X-Git-Newrev: 1c1ba3494bc46f0a2c4be30229a7e8a4c4e7228e

The following commit has been merged in the master branch:
commit 5459a716359eaa22d828b09ad2abbbde63994c57
Merge: cdadf60220ab3c2ee5e67a5158f120265200356f ca4b67a109573c5a5adae6b0be6b9a115bca9a99
Author: Joël Krähemann <jkraehemann at gmail.com>
Date:   Wed Jan 17 05:35:16 2018 +0100

    Update upstream source from tag 'upstream/1.4.6'
    
    Update to upstream version '1.4.6'
    with Debian dir 5bca72004e9588557be01fa0fb559140780e162d


-- 
gsequencer packaging