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

commit 55ce0f6d7092ca0e919d28cb40093365da4b82f9
Merge: d93ddc3 5d2253e
Author: Tobias Grimm <etobi at debian.org>
Date:   Sun Nov 15 21:03:09 2015 +0100

    Merge branch 'master' into e-tobi

 debian/changelog   | 7 +++++++
 debian/vdr.service | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index f015d2b,75cce24..3222c16
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,11 +1,11 @@@
 -vdr (2.2.0-5) unstable; urgency=medium
++vdr (2.2.0-5~etobi1) unstable; urgency=medium
+ 
+   * Fixed typo in vdr.NEWS
+   * Fixed typo in systemd service causing the reccmds merging to fail
+ 
+  -- Tobias Grimm <etobi at debian.org>  Sun, 15 Nov 2015 20:49:01 +0100
+ 
 -vdr (2.2.0-4) unstable; urgency=medium
 +vdr (2.2.0-4~etobi1) unstable; urgency=medium
  
    * Fixed installation of auto generated plugin config to happen before
      dh_fixperms

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