[SCM] x264/master: Merge tag 'upstream/0.148.2668+gitfd2c324'

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

Imported Upstream version 0.148.2668+gitfd2c324
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 066cf82a7c0db4ba06a8b515cf7e7a19dbb0a24a
X-Git-Newrev: 79693e7205ba45962486f2445e32adc3673c97d0

The following commit has been merged in the master branch:
commit 83c1d3d8cacc9c0458056921df42c968aec609c8
Merge: ee770f5c6befe744b3663c09a4f31d06e16d2591 0b55bccb1da7b36f56bb30120592d69265f26766
Author: Rico Tzschichholz <ricotz at ubuntu.com>
Date:   Mon Apr 18 21:38:30 2016 +0200

    Merge tag 'upstream/0.148.2668+gitfd2c324'
    
    Upstream version 0.148.2668+gitfd2c324


-- 
x264 packaging