[vdr] 02/03: 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.2.0-2_etobi3
in repository vdr.

commit 30919dfd7d7e11a2cb626351c43e7e483aec0fb3
Merge: 538e25d b8ed752
Author: etobi <git at e-tobi.net>
Date:   Sun Sep 6 16:46:25 2015 +0200

    Merge branch 'master' into e-tobi

 debian/dh-addon-vdrplugin/preinst-vdrplugin-enable | 1 +
 1 file changed, 1 insertion(+)

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