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

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

Imported Upstream version 1.2.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: cf69ca844cddfb41da0c8c31e2f9b65cb4d17368
X-Git-Newrev: abe7e9e8842c9da6e6674e52aa29240b6b8b3388

The following commit has been merged in the master branch:
commit abe7e9e8842c9da6e6674e52aa29240b6b8b3388
Merge: cf69ca844cddfb41da0c8c31e2f9b65cb4d17368 bda0925cd9bca5404fed847b0f00957b3c7fa08e
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Tue Jun 10 01:15:08 2014 +0200

    Merge tag 'upstream/1.2.1'
    
    Upstream version 1.2.1


-- 
yoshimi packaging