[SCM] dvdstyler/master: Merge tag 'upstream/2.5.1'

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

Imported Upstream version 2.5.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: ed58e208c3bc2dc1c354bc47608d97295fcc8dd5
X-Git-Newrev: ad3aadeaca149cfad706db8b5bb2e8b196d8f5f3

The following commit has been merged in the master branch:
commit b5675a46f1821b9161962c7a81c09bcdfb05d179
Merge: ed58e208c3bc2dc1c354bc47608d97295fcc8dd5 b796acb1a262d5fa62bcb1c5bb07ac5ad59f2643
Author: Fabrice Coutadeur <coutadeurf at gmail.com>
Date:   Fri Aug 16 16:38:02 2013 +0200

    Merge tag 'upstream/2.5.1'
    
    Upstream version 2.5.1


-- 
dvdstyler packaging