[SCM] zynaddsubfx/master: Merge tag 'upstream/2.5.4'

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

Imported Upstream version 2.5.4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: d3c6221516f8595aabaa2d4b133e7f250b307523
X-Git-Newrev: 76485e4f544eab51a20f588537efa5538d97b37f

The following commit has been merged in the master branch:
commit 76485e4f544eab51a20f588537efa5538d97b37f
Merge: d3c6221516f8595aabaa2d4b133e7f250b307523 8d8f45e238b5b42f6479ff00da5ad435552a2ce9
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Wed Jun 15 08:41:46 2016 +0200

    Merge tag 'upstream/2.5.4'
    
    Upstream version 2.5.4


-- 
zynaddsubfx packaging