[vdr-plugin-femon] 02/05: Merge tag 'upstream/2.1.1'

[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 b2f6dd5c825bfb4ae475886e00f70fe1f0a7e742
Merge: ef2c3e3 5cf96d7
Author: etobi <git at e-tobi.net>
Date:   Mon Feb 9 18:59:12 2015 +0100

    Merge tag 'upstream/2.1.1'
    
    Upstream version 2.1.1

 HISTORY      | 13 +++++++++++++
 femon.c      |  6 +++---
 femonosd.c   |  7 ++++++-
 femontools.c | 10 ++++++++--
 femontools.h |  1 +
 po/de_DE.po  |  6 +++---
 po/es_ES.po  |  6 +++---
 po/et_EE.po  |  6 +++---
 po/fi_FI.po  |  6 +++---
 po/fr_FR.po  |  6 +++---
 po/hu_HU.po  |  6 +++---
 po/it_IT.po  |  6 +++---
 po/lt_LT.po  |  6 +++---
 po/ru_RU.po  |  6 +++---
 po/sk_SK.po  |  6 +++---
 po/uk_UA.po  |  6 +++---
 po/zh_CN.po  |  6 +++---
 po/zh_TW.po  |  6 +++---
 18 files changed, 70 insertions(+), 45 deletions(-)

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