[SCM] x264/master: Merge tag 'upstream/0.133.2339+git585324f'

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

Imported Upstream version 0.133.2339+git585324f
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 323918029ed525819f23895f3887153229a19077
X-Git-Newrev: de1d0955906bdfedb722d4ae7fe89576fd79656f

The following commit has been merged in the master branch:
commit cbed4437b6dcb6ba16c11322e8442dd633a9afbe
Merge: 198326cc224bd357b931ca6af97c19fb753b9e46 39a7c6b78a64493332e4c9e01c7bd2d8d66b5394
Author: Rico Tzschichholz <ricotz at ubuntu.com>
Date:   Fri Jul 26 18:38:27 2013 +0200

    Merge tag 'upstream/0.133.2339+git585324f'
    
    Upstream version 0.133.2339+git585324f


-- 
x264 packaging