[SCM] libgig/master: Resolve merge.

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

New upstream version 4.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: 6132609a7bb98929a2b290ebd0da82b9a5391637
X-Git-Newrev: 6e7cba55f2e1e6c3056db11aec3521c717966aa0

The following commit has been merged in the master branch:
commit 6e7cba55f2e1e6c3056db11aec3521c717966aa0
Merge: 6132609a7bb98929a2b290ebd0da82b9a5391637 796b845e8fedfd524e6f5b9cc84e016cb10cb6c9
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Wed Nov 16 14:51:50 2016 +0100

    Resolve merge.


-- 
libgig packaging