[SCM] x264/master: Merge tag 'upstream/0.142.2389+git956c8d8'

[siretart at users.alioth.debian.org]

Imported Upstream version 0.142.2389+git956c8d8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: a4fcb600ae27f4e752e48f362a8aaaa4b7b12c6b
X-Git-Newrev: 5e76186e567c9ff10640788c9e3a18f12be82ea8

The following commit has been merged in the master branch:
commit 6a4ad596a73f6a26e1602ca37025c0f8383e1b7f
Merge: 44d1517ac19b60b5d294888dff8197ed0412a17f f91e948e2d81ad7a3ae45d88cec8c633a07e63ee
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Feb 13 23:26:45 2014 +0000

    Merge tag 'upstream/0.142.2389+git956c8d8'
    
    Upstream version 0.142.2389+git956c8d8


-- 
x264 packaging