[SCM] x264/master: Merge tag 'upstream/0.146.2555+git0c21480'

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

Imported Upstream version 0.146.2555+git0c21480
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 330592175351bded2c171dddcb04b35160e66d36
X-Git-Newrev: 411541342b2dcd2c7c5b4ea07ec400632973ac68

The following commit has been merged in the master branch:
commit f655eb8241dc95e4858d8b4deb62e1ad166caeed
Merge: 4e6bcbdd83222fc66b957019b2c974b87a8516c0 c177eabb5624e4df814b09b82a1d3aacaaba228f
Author: Rico Tzschichholz <ricotz at ubuntu.com>
Date:   Mon Aug 3 16:31:25 2015 +0200

    Merge tag 'upstream/0.146.2555+git0c21480'
    
    Upstream version 0.146.2555+git0c21480


-- 
x264 packaging