[vdr] 01/02: 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-6_etobi1
in repository vdr.

commit eca379c89e055d89c6b51eb66072adc42a3b522f
Merge: 55ce0f6 5b31c54
Author: Tobias Grimm <etobi at debian.org>
Date:   Mon Jun 6 19:20:42 2016 +0200

    Merge branch 'master' into e-tobi

 debian/README.Debian |  2 +-
 debian/changelog     |  9 +++++++
 debian/control       |  2 +-
 debian/po/pt_BR.po   | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 84 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 3222c16,36eb766..9bce8eb
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,13 +1,13 @@@
 -vdr (2.2.0-6) unstable; urgency=medium
++vdr (2.2.0-6~etobi1) UNRELEASED; urgency=medium
+ 
+   * Added Brazilian Portuguese translations for debconf provided by
+     Adriano Rafael Gomes (closes: #811514)
+   * Fixed spelling error in README.Debian
+   * Standards-Version: 3.9.8
+ 
 - -- Tobias Grimm <etobi at debian.org>  Mon, 06 Jun 2016 19:04:35 +0200
++ -- Tobias Grimm <etobi at debian.org>  Mon, 06 Jun 2016 19:19:00 +0200
+ 
 -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

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