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

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

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

The following commit has been merged in the master branch:
commit edcbca62d3cd3b7ac8c18204fb7dfbcaa85c41f7
Merge: b9b7b8917493baf1d9a653d2de7ae79aeaf20831 e24f831c1eead3f726c35d23f2777bf020e587dd
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Thu Jun 16 00:43:17 2016 +0200

    Merge tag 'upstream/1.4.0'
    
    Upstream version 1.4.0


-- 
yoshimi packaging