[Pkg-nagios-changes] [pkg-monitoring-plugins] 03/06: Merge tag 'upstream/2.1.1'

[Jan Wagner]

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

waja pushed a commit to branch master
in repository pkg-monitoring-plugins.

commit 9461ddf0839b6c5076e5215310de2eba1d7a45c7
Merge: 83dffb8 61401f6
Author: Jan Wagner <waja at cyconet.org>
Date:   Tue Dec 2 05:36:30 2014 +0100

    Merge tag 'upstream/2.1.1'
    
    Upstream version 2.1.1

 ChangeLog                 |  55 ++++++++++++++++++++++++++++++++++++++++
 NEWS                      |   8 ++++++
 NP-VERSION-GEN            |   2 +-
 THANKS                    |   1 +
 configure                 |  20 +++++++--------
 configure.ac              |   2 +-
 pkg/solaris/pkginfo       |   4 +--
 plugins/check_apt.c       |   2 +-
 plugins/check_ntp.c       |  25 +++++++++---------
 plugins/check_real.c      |   2 +-
 plugins/check_tcp.c       |   2 +-
 po/de.gmo                 | Bin 7632 -> 7632 bytes
 po/de.po                  |  62 +++++++++++++++++++++------------------------
 po/fr.gmo                 | Bin 91740 -> 91520 bytes
 po/fr.po                  |  63 +++++++++++++++++++++-------------------------
 po/monitoring-plugins.pot |  62 +++++++++++++++++++++------------------------
 release                   |   2 +-
 17 files changed, 180 insertions(+), 132 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-monitoring-plugins.git