[SCM] x264/master: Merge tag 'upstream/0.148.2699+gita5e06b9'

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

Imported Upstream version 0.148.2699+gita5e06b9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 6ff2281cd38e81b5f3f42148167d34191bbe5760
X-Git-Newrev: 1460a68228d63b5e0d9eff1c2c0ba4926a26c2b7

The following commit has been merged in the master branch:
commit 0bfc726d45ad13db915c62c2f818ca4910ddc7ee
Merge: 2357d696a67d3a7525aa5c79283b7070f52126a2 0293446fdbef57f50494a920dc56041552b5e95d
Author: Rico Tzschichholz <ricotz at ubuntu.com>
Date:   Tue Jun 14 08:15:44 2016 +0200

    Merge tag 'upstream/0.148.2699+gita5e06b9'
    
    Upstream version 0.148.2699+gita5e06b9


-- 
x264 packaging