[SCM] handbrake/master: Merge tag 'upstream/0.9.9+dfsg'

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

Imported Upstream version 0.9.9+dfsg
Imported Upstream version 0.9.9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: a66da982f7eb6cb87af83139f3efd70e7b7db114
X-Git-Newrev: e5af44e1701082dc54599628c4eead14380d6dce

The following commit has been merged in the master branch:
commit f2137f78cac32834e6ad6bd0ec36083ec4ccda06
Merge: 9d42ccffdc065c69955bcb54a2234fe5b1692688 25080ad57fe06de150eda1f7549f563986a86ff4
Author: Rogério Brito <rbrito at ime.usp.br>
Date:   Wed May 22 21:46:15 2013 -0300

    Merge tag 'upstream/0.9.9+dfsg'
    
    Upstream version 0.9.9+dfsg
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/gbp.conf
    	debian/patches/0003-Remove-embedded-downloaded-copies-of-various-librari.patch
    	debian/patches/0004-Enable-compilation-on-Debian-arches-other-than-Linux.patch
    	debian/patches/0005-libhb-Fix-compilation-with-mp4v2-v1.9.1.patch
    	debian/patches/0010-Remove-FAAC-dependency.patch
    	debian/patches/0011-First-try-at-removing-some-of-mp4v2.patch
    	debian/patches/0014-Use-unpatched-a52.patch
    	debian/patches/0016-use-older-libmkv.patch
    	debian/patches/series


-- 
handbrake packaging