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

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

Imported Upstream version 1.1.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: 0a02102ba2db76225e91e6eb78d76ebaf5063d20
X-Git-Newrev: 6ca1d8ce3ec703f423da73d3bb242120d1e04c03

The following commit has been merged in the master branch:
commit 6ca1d8ce3ec703f423da73d3bb242120d1e04c03
Merge: 0a02102ba2db76225e91e6eb78d76ebaf5063d20 cd7eb265d813aa2a62bfa2d11fc62e3add8bc8db
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Wed May 8 20:01:43 2013 +0200

    Merge tag 'upstream/1.1.0'
    
    Upstream version 1.1.0


-- 
yoshimi packaging