[Pkg-nagios-changes] [icinga] 05/06: Merge tag 'upstream/1.12.2'

[Alexander Wirt]

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

formorer pushed a commit to branch master
in repository icinga.

commit 7a7cc98eba5e203d646f654f4fd564452c5a2702
Merge: 72f3f0c ffdb896
Author: Alexander Wirt <formorer at debian.org>
Date:   Thu Mar 12 13:57:14 2015 +0100

    Merge tag 'upstream/1.12.2'
    
    Upstream version 1.12.2

 Changelog                        | 14 ++++++++++++++
 INSTALLING                       |  8 ++++----
 Makefile.in                      |  2 +-
 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 ++--
 xdata/xodtemplate.c              |  2 +-
 11 files changed, 34 insertions(+), 20 deletions(-)

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