[Pkg-nagios-changes] [icinga] 03/08: Merge tag 'upstream/1.13.4'

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository icinga.

commit 30f69c324b559c90b53e01a30e1c09e60a895ab8
Merge: a7bdba3 59f6cb8
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Dec 23 09:39:52 2016 +0100

    Merge tag 'upstream/1.13.4'
    
    Upstream version 1.13.4

 Changelog                        |  9 +++++++
 Makefile.in                      |  2 +-
 THANKS                           |  1 +
 base/icinga.c                    |  6 ++---
 base/logging.c                   | 56 +++++++++++++++++++++++++++++++++-------
 configure                        |  4 +--
 configure.in                     |  4 +--
 html/main.html                   |  6 ++---
 icinga.spec                      |  2 +-
 include/common.h                 |  4 +--
 module/idoutils/include/common.h |  4 +--
 update-version                   |  4 +--
 12 files changed, 75 insertions(+), 27 deletions(-)

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