[SCM] x264/master: Merge tag 'upstream/0.148.2643+git5c65704'

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

Imported Upstream version 0.148.2643+git5c65704
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 6119f926c45c7753153c0b1d4c397bfb04616204
X-Git-Newrev: 27a08e1df9369c7ce7d4b44ca4542017ef390abd

The following commit has been merged in the master branch:
commit 27a08e1df9369c7ce7d4b44ca4542017ef390abd
Merge: 7e435c08496f5c61bf7f18f5792a0b5c33ebd1d3 ff8410cd094157129243b484aecd90bc57ba18d2
Author: Rico Tzschichholz <ricotz at ubuntu.com>
Date:   Mon Jan 18 18:06:14 2016 +0100

    Merge tag 'upstream/0.148.2643+git5c65704'
    
    Upstream version 0.148.2643+git5c65704


-- 
x264 packaging