[SCM] x264/master: Merge tag 'upstream/0.148.2601+gita0cd7d3'

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

Imported Upstream version 0.148.2601+gita0cd7d3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 2316e194bb7cb5b039037e1dc4a8b33a94402ff5
X-Git-Newrev: d5d838fc2b9d82d9388d7cc3de8caa0214a74d2a

The following commit has been merged in the master branch:
commit 9d0ba5556539511a22bff239396ddf26472afeec
Merge: 93fe7f7caecc6c95eaf14f8d9b2d388eb66925b9 b07ec02b986d8f6d1d48996e14559f2ba9756577
Author: Rico Tzschichholz <ricotz at ubuntu.com>
Date:   Wed Oct 14 20:16:18 2015 +0200

    Merge tag 'upstream/0.148.2601+gita0cd7d3'
    
    Upstream version 0.148.2601+gita0cd7d3


-- 
x264 packaging