[vdr-plugin-iptv] 02/04: Merge tag 'upstream/2.2.0'

[Tobias Grimm]

This is an automated email from the git hooks/post-receive script.

tiber-guest pushed a commit to branch master
in repository vdr-plugin-iptv.

commit 490865e2489a2e71be2bb90e5dc441adc26eaeef
Merge: 673c4cb 53798a1
Author: etobi <git at e-tobi.net>
Date:   Sun Mar 1 03:21:11 2015 +0100

    Merge tag 'upstream/2.2.0'
    
    Upstream version 2.2.0

 HISTORY                   | 11 ++++++++
 Makefile                  |  2 +-
 iptv.c                    |  6 ++--
 po/de_DE.po               | 42 +++++++++++++++++-----------
 po/fi_FI.po               | 15 +++++-----
 po/fr_FR.po               | 15 +++++-----
 po/it_IT.po               | 15 +++++-----
 po/{fi_FI.po => lt_LT.po} | 71 +++++++++++++++++++++++------------------------
 po/nl_NL.po               | 15 +++++-----
 po/ru_RU.po               | 15 +++++-----
 setup.c                   |  5 ++--
 11 files changed, 113 insertions(+), 99 deletions(-)

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