[SCM] x264/master: Merge tag 'upstream/0.142.2412+gitd7e6896'

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

Imported Upstream version 0.142.2412+gitd7e6896
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 3f85d96c6658af8c298641b19b167fb76647121d
X-Git-Newrev: 4db7234d1596249ea47cd156daab2366a32c7942

The following commit has been merged in the master branch:
commit 3cb5619533440db606e52d5fd52485f4dd4d6af5
Merge: 3845490a7eed8bf96521c1dbfb8f0fd9b2427a05 7c3448f9ec783cbbe06dffc4b2544920bd35f037
Author: Rico Tzschichholz <ricotz at ubuntu.com>
Date:   Sat Jun 7 09:14:36 2014 +0200

    Merge tag 'upstream/0.142.2412+gitd7e6896'
    
    Upstream version 0.142.2412+gitd7e6896


-- 
x264 packaging