[vdr] 11/12: 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 4abd6101e2b48968c25c39b3fe25717cf26942d7
Merge: 3218989 573f055
Author: etobi <git at e-tobi.net>
Date:   Sun Aug 30 13:29:57 2015 +0200

    Merge branch 'master' into e-tobi

 debian/README.Debian                             | 10 ++++++++++
 debian/control                                   |  2 +-
 debian/{commands-loader.sh => merge-commands.sh} | 23 ++++++++++-------------
 debian/switch-tty.conf                           |  8 ++++++++
 debian/vdr.init                                  |  7 ++-----
 debian/vdr.install                               |  3 ++-
 debian/vdr.service                               |  2 ++
 7 files changed, 35 insertions(+), 20 deletions(-)

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