[Pkg-nagios-changes] [icinga] 02/02: Merge branch 'master' into debmon-squeeze

[Alexander Wirt]

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

formorer pushed a commit to annotated tag debian/1.11.4-1_debmon60+1
in repository icinga.

commit 73559c8725f8e4be5e1edc0e29ac065ec22e8886
Merge: c3afafb 6f5186c
Author: Alexander Wirt <formorer at debian.org>
Date:   Thu May 29 18:20:16 2014 +0200

    Merge branch 'master' into debmon-squeeze

 debian/changelog |  7 +------
 debian/copyright | 25 +++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --cc debian/changelog
index 74b01f9,c43c010..ba5440b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,6 +1,12 @@@
 +icinga (1.11.4-1~debmon60+1) debmon-squeeze; urgency=medium
 +
 +  * Build for debmon-squeeze 
 +
 + -- Alexander Wirt <formorer at debian.org>  Sun, 30 Mar 2014 16:50:10 +0200
 +
  icinga (1.11.4-1) unstable; urgency=medium
  
+   * [4b8b43e] Update copyright file (Closes: #748015)
    * [f87dd9b] Imported Upstream version 1.11.4
    * [28a3f90] Remove obsolete patch 96_fix_postgres_11.3_upgrade.dpatch
  

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