[Pkg-nagios-changes] [icinga] 01/01: Merge branch 'master' into debmon-wheezy

[Alexander Wirt]

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

formorer pushed a commit to branch debmon-wheezy
in repository icinga.

commit fba80ca1976fe9b12007ebfa2c09bfa41e4e8f8f
Merge: 954d44f 698ab3a
Author: Alexander Wirt <formorer at debian.org>
Date:   Sat Mar 14 07:48:04 2015 +0100

    Merge branch 'master' into debmon-wheezy
    
    Conflicts:
    	debian/changelog

 debian/changelog | 8 +++++++-
 debian/control   | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index ffbd7d4,0139696..49391d4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
- icinga (1.12.2-1~debmon70+1) debmon-wheezy; urgency=medium
++icinga (1.12.2-2~debmon70+1) debmon-wheezy; urgency=medium
 +
 +  * Rebuild for debmon
 +
 + -- Alexander Wirt <formorer at debian.org>  Tue, 18 Feb 2014 16:58:58 +0100
 +
+ icinga (1.12.2-2) experimental; urgency=medium
+ 
+   * [17f0a2c] Fix plugin package name
+ 
+  -- Alexander Wirt <formorer at debian.org>  Sat, 14 Mar 2015 07:42:11 +0100
+ 
  icinga (1.12.2-1) experimental; urgency=medium
  
    * [ffdb896] Imported Upstream version 1.12.2

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