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

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

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

The following commit has been merged in the master branch:
commit aa4debf3d1c944d0711c333c89489c9b4f4ceee2
Merge: 5fa6aac29ef2daa28f345f050c0c8f9506faf6c2 019ee66099e1710c87d0ba8b2adf6f8d98de9c8c
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Tue Jul 1 20:00:36 2014 +0200

    Merge tag 'upstream/1.2.2'
    
    Upstream version 1.2.2


-- 
yoshimi packaging