[SCM] x264/master: Merge tag 'upstream/0.148.2748+git97eaef2'

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

New upstream version 0.148.2748+git97eaef2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 9d1c4dce23881add587bace558cd1ebc7f3d8052
X-Git-Newrev: 488910a49272124991e50c5465e0be90b7697ef9

The following commit has been merged in the master branch:
commit 488910a49272124991e50c5465e0be90b7697ef9
Merge: 20c6c5df5dcff4ee16612924cad65da945715694 596fd266699c85e3ab4086db45934bd2b6b895b7
Author: Rico Tzschichholz <ricotz at ubuntu.com>
Date:   Wed Jan 25 10:30:31 2017 +0100

    Merge tag 'upstream/0.148.2748+git97eaef2'
    
    Upstream version 0.148.2748+git97eaef2


-- 
x264 packaging