[SCM] gigedit/master: Resolve merge.

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

New upstream version 1.0.0~repack
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: faadfcd0f3fbfd2b6a0dd4c2515c037964d1aaa3
X-Git-Newrev: 89b8e8060bbbb858e49ccb455cfabb4237e10e4b

The following commit has been merged in the master branch:
commit 89b8e8060bbbb858e49ccb455cfabb4237e10e4b
Merge: faadfcd0f3fbfd2b6a0dd4c2515c037964d1aaa3 8f7b3daf4508dd6052383932556b679f186a4104
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Sun Nov 20 22:10:08 2016 +0100

    Resolve merge.


-- 
gigedit packaging