[SCM] x264/master: Merge tag 'upstream/0.148.2708+git86b7198'

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

Imported Upstream version 0.148.2708+git86b7198
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: be62f45a4881437c4e28f8f2f60ce50223b7df89
X-Git-Newrev: a16ca1e9ef593b0b5d095b59eb1dd3fb047faaf2

The following commit has been merged in the master branch:
commit a16ca1e9ef593b0b5d095b59eb1dd3fb047faaf2
Merge: af9840fb3f6cdbab72e0e16d779e56dd173bfdbf 4815c76b7ecd7c23932f1a7ecf4e68f8780c3181
Author: Rico Tzschichholz <ricotz at ubuntu.com>
Date:   Wed Sep 21 22:40:41 2016 +0200

    Merge tag 'upstream/0.148.2708+git86b7198'
    
    Upstream version 0.148.2708+git86b7198


-- 
x264 packaging