[SCM] xvidcore/master: Merge tag 'upstream/1.3.4'

[fabian at users.alioth.debian.org]

Imported Upstream version 1.3.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: 1c5373f97a2cacbba5b8764350d656c86f360540
X-Git-Newrev: a4ed1c8c8746b99203aba49e30c63a20162d0793

The following commit has been merged in the master branch:
commit ba2925468724b9dc695d31d68e9a712de419e359
Merge: 49fa299f482318a8698a699745cda7016a6354a2 a4c1d9e811d4c0826b8889d25aaa5338cd5dc771
Author: Fabian Greffrath <fabian at debian.org>
Date:   Mon Jun 29 09:20:22 2015 +0200

    Merge tag 'upstream/1.3.4'
    
    Upstream version 1.3.4


-- 
xvidcore packaging