[vdr-plugin-femon] 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-femon.

commit 8a1274aa2ed716d81333700118cabb18a3f272bf
Merge: 3a007d9 e6c65ce
Author: etobi <git at e-tobi.net>
Date:   Sun Feb 22 11:49:32 2015 +0100

    Merge tag 'upstream/2.2.0'
    
    Upstream version 2.2.0

 HISTORY      |  14 +++++++
 femon.c      |   8 ++--
 femonosd.c   | 128 +++++++++++++++++++++++++++++------------------------------
 femontools.c |  29 ++++++++++----
 po/de_DE.po  |   8 ++--
 po/es_ES.po  |   8 ++--
 po/et_EE.po  |   8 ++--
 po/fi_FI.po  |   8 ++--
 po/fr_FR.po  |   8 ++--
 po/hu_HU.po  |   8 ++--
 po/it_IT.po  |   8 ++--
 po/lt_LT.po  |  46 ++++++++++-----------
 po/ru_RU.po  |   8 ++--
 po/sk_SK.po  |   8 ++--
 po/uk_UA.po  |   6 +--
 po/zh_CN.po  |   8 ++--
 po/zh_TW.po  |   8 ++--
 17 files changed, 173 insertions(+), 146 deletions(-)

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