[SCM] x264/master: Merge tag 'upstream/0.142.2431+gita5831aa'

[siretart at users.alioth.debian.org]

Imported Upstream version 0.142.2431+gita5831aa
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: a0e7edbcba44358543e38447b0ef4a577f42425d
X-Git-Newrev: d014dedac3b391976893d7caa652f2163648ac63

The following commit has been merged in the master branch:
commit 8e1ba8e8045afe7c9ee38f37126d44bc4fee6af4
Merge: ba8601f11fa344d5eb7c74f2dc7ffd18ade2b5b6 cf1ef6ce2449440a48b11f590ea466a832e1ea13
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Jul 10 21:18:42 2014 -0400

    Merge tag 'upstream/0.142.2431+gita5831aa'
    
    Upstream version 0.142.2431+gita5831aa


-- 
x264 packaging