[SCM] x264/master: Merge tag 'upstream/0.146.2538+git121396c'

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

Imported Upstream version 0.146.2538+git121396c
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: a17e1e6557ee0a67cfc6735724b922daefc2cc0c
X-Git-Newrev: 15195f7e23dd8ebac79501f5b04dc9694a25d4bd

The following commit has been merged in the master branch:
commit 6d25334325d86a3a2cd11eb07b60473bdf5a4a7a
Merge: 9957ee891b63d212fd74f8fc37e6414f753f260a 6f4a2570ff8abe8f951a3ff462f967b2d4d101ea
Author: Rico Tzschichholz <ricotz at ubuntu.com>
Date:   Mon May 11 10:24:49 2015 +0200

    Merge tag 'upstream/0.146.2538+git121396c'
    
    Upstream version 0.146.2538+git121396c


-- 
x264 packaging