[SCM] handbrake/master: Merge branch 'upstream'

[siretart at users.alioth.debian.org]

Import upstream revision svn6032
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: c80e3dcce417f68465eebbdd8753bab3d498fbc0
X-Git-Newrev: 2dd1aa069451b76a08c9a26f7aee845d86753cb5

The following commit has been merged in the master branch:
commit 10d33c593f1479572463dbaf35edea341025c172
Merge: c80e3dcce417f68465eebbdd8753bab3d498fbc0 2490aeda9621bfdcf1b4c3f0716742bafef8b1de
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Feb 15 17:13:24 2014 +0000

    Merge branch 'upstream'


-- 
handbrake packaging