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

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

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

The following commit has been merged in the master branch:
commit 6e488cbafa886fc96c81217e5a3951db665df866
Merge: 0e6d879bc8ba4517ac9d1f88523d8e03bdae34e7 d2888c8784dcbb2de7fe2445e79a50dea4d4bfe6
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Fri Oct 3 16:14:24 2014 +0200

    Merge tag 'upstream/1.2.4'
    
    Upstream version 1.2.4


-- 
yoshimi packaging