[vdr] 21/21: 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 branch e-tobi
in repository vdr.

commit 2155b4d76c905888ce48429eec5afadc232407d0
Merge: 6f1cf92 83b9e3e
Author: etobi <git at e-tobi.net>
Date:   Wed Mar 25 00:18:51 2015 +0100

    Merge branch 'master' into e-tobi


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