[SCM] libdvdread/master: Merge tag 'upstream/4.2.1'

[bdrung at users.alioth.debian.org]

Imported Upstream version 4.2.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: 31a029803e1f0a5a41870643aa7d1d71372e491a
X-Git-Newrev: 5995d989ba17a9802cd044513e7f4d57b848e570

The following commit has been merged in the master branch:
commit cf02d81c73ff79b4a7dc9da340f830736742364d
Merge: 31a029803e1f0a5a41870643aa7d1d71372e491a b99461698c85fa80188ebdb16991d7fd6274a0d9
Author: Benjamin Drung <bdrung at debian.org>
Date:   Sun Jan 5 16:09:11 2014 +0100

    Merge tag 'upstream/4.2.1'
    
    Upstream version 4.2.1


-- 
libdvdread packaging