[SCM] yoshimi/master: Merge tag 'upstream/1.4.0.1'

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

Imported Upstream version 1.4.0.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: edcbca62d3cd3b7ac8c18204fb7dfbcaa85c41f7
X-Git-Newrev: 6f00acfa190c369ae71982ed9fb712f4e807ddb5

The following commit has been merged in the master branch:
commit 6f00acfa190c369ae71982ed9fb712f4e807ddb5
Merge: 2b7b42b4c513ed5165a40406be7778dd08d06106 1a7b46f1db61e681bfc9813954d68298162bd316
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Thu Jun 16 03:23:15 2016 +0200

    Merge tag 'upstream/1.4.0.1'
    
    Upstream version 1.4.0.1


-- 
yoshimi packaging