[SCM] x264/master: Merge tag 'upstream/0.142.2495+git6a301b6'

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

Imported Upstream version 0.142.2495+git6a301b6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: e947bb5e819572cedcc764605c394e17c58b3190
X-Git-Newrev: e25fb6293989f417defb9b2867e2d5a38573e653

The following commit has been merged in the master branch:
commit 3b313871e6d555b1f127c8d0caeae45dee888907
Merge: f97a32cb86f1d84fb889fcd9b478aeeb7bf14cef 5cbc0607c5a1c7f3ba1b26172cc15def4ecb3711
Author: Rico Tzschichholz <ricotz at ubuntu.com>
Date:   Wed Jan 14 22:35:41 2015 +0100

    Merge tag 'upstream/0.142.2495+git6a301b6'
    
    Upstream version 0.142.2495+git6a301b6


-- 
x264 packaging