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

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

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

The following commit has been merged in the master branch:
commit cd4b77d07d47854034e82b4784b6c2fab53fed4b
Merge: 7be2fc9d56e13ed6ba72b9e82e33d7612ed8d12a 2d7c374efcf4ceaa197053735ee66f2124671ed8
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Mon Mar 17 00:52:48 2014 +0100

    Merge tag 'upstream/1.2.0'
    
    Upstream version 1.2.0


-- 
yoshimi packaging