[SCM] hydrogen/master: Resolve merge.

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

New upstream version 0.9.7~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: 969945f8d336f5dd16334603482ebc92c57aac8a
X-Git-Newrev: 3465d49443ecc7eaee571879a056c018fff93d94

The following commit has been merged in the master branch:
commit 3465d49443ecc7eaee571879a056c018fff93d94
Merge: 3faebf1a6bc393cf0fe4dadf411d362c7a5d1fa8 46ef3a3eb0c8fa6ccf43a95285524ba76235b2ce
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Thu Nov 10 18:45:00 2016 +0100

    Resolve merge.


-- 
hydrogen packaging