[SCM] libdvdnav/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: 3e2f15c56166edb5ab88a03336099dbd242e7532
X-Git-Newrev: 10fafd0981eabb6fa857fb0498d215beba2b33a2

The following commit has been merged in the master branch:
commit 920e04bf9ecf904c47247e947508bf8580af8b24
Merge: 3e2f15c56166edb5ab88a03336099dbd242e7532 f0bac4f68a5ab209b6187f039100124799b09bbe
Author: Benjamin Drung <bdrung at debian.org>
Date:   Sat Jan 11 17:48:31 2014 +0100

    Merge tag 'upstream/4.2.1'
    
    Upstream version 4.2.1


-- 
libdvdnav packaging