[vdr] 04/05: Merge branch 'master' into e-tobi

[Tobias Grimm]

This is an automated email from the git hooks/post-receive script.

tiber-guest pushed a commit to annotated tag debian/2.3.8-1_etobi1
in repository vdr.

commit 81c8bd1486f26ef6019a88a6aa8f2ee40c25eccd
Merge: f06ff9c c348003
Author: Tobias Grimm <etobi at debian.org>
Date:   Wed Dec 27 13:41:21 2017 +0100

    Merge branch 'master' into e-tobi

 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/vdr.git