[vdr] 17/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 13cf9c345acfab873654365fb05cf829e3480063
Merge: b51a24e 779f028
Author: etobi <git at e-tobi.net>
Date:   Wed Mar 25 00:10:19 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