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

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

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

The following commit has been merged in the master branch:
commit 5295619015a20c5ed42e057e6896910c8f0e847e
Merge: f5a2d8ec2d89f8fe998eba6e4204e4605c83c4d5 6dfde53afec74c852c2dd4aababd3c59f06456f9
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Tue Sep 29 05:25:21 2015 +0200

    Merge tag 'upstream/1.3.6'
    
    Upstream version 1.3.6


-- 
yoshimi packaging