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

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

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

The following commit has been merged in the master branch:
commit f77880d79e57db3f28586ce53b4b912e45eda064
Merge: a3684a0d20be1e3e8752f0fc10be4a58356c9045 15751aff8932c54349e46525762c5e0a9e328557
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Sat Aug 30 13:34:44 2014 +0300

    Merge tag 'upstream/1.2.3'
    
    Upstream version 1.2.3


-- 
yoshimi packaging