[SCM] transcode/master: Merge tag 'upstream/1.1.5'

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

Imported Upstream version 1.1.5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 75acb995fad1cb7f59bce36356a0be7e6da92a5c
X-Git-Newrev: b8d5f304bbb448e7c1be50d9a502039314d2364e

The following commit has been merged in the master branch:
commit b8d5f304bbb448e7c1be50d9a502039314d2364e
Merge: 75acb995fad1cb7f59bce36356a0be7e6da92a5c 494c6547a0ebb6d60ad71722d8dfdf13a59e469a
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Tue Feb 7 16:41:10 2012 +0100

    Merge tag 'upstream/1.1.5'
    
    Upstream version 1.1.5


-- 
transcode packaging