[SCM] libdvdcss/master: Merge commit 'upstream/1.2.11'

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

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

The following commit has been merged in the master branch:
commit f8c90b8f327a721076d6a82d743d25ec99f5aff4
Merge: e7b71aec82384d504230d7138f8e14eba07681ba e56af22911911ba64dc3e09e6dafe7133d1ee2fa
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Tue Dec 13 13:16:14 2011 +0100

    Merge commit 'upstream/1.2.11'


-- 
libdvdcss packaging