[SCM] x264/master: Merge tag 'upstream/0.130.2282+git1db4621'

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

Imported Upstream version 0.130.2282+git1db4621
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 708339e530367465755cccdf3b89362f0f6bcb56
X-Git-Newrev: 4610a77562ce7f9ef8045933e1beefc4151c0e07

The following commit has been merged in the master branch:
commit fa730b945c33f6647fb17577190a54fb54c39197
Merge: 7efbd5d8b3e7d478d503665a35740c6cf69eff30 e46c48d1772401581d9c233b0d3c2f8dea5c741b
Author: Rico Tzschichholz <ricotz at ubuntu.com>
Date:   Sat May 11 13:25:11 2013 +0200

    Merge tag 'upstream/0.130.2282+git1db4621'
    
    Upstream version 0.130.2282+git1db4621


-- 
x264 packaging