[Pkg-nagios-changes] [icinga] 02/04: Merge branch 'master' into ubuntu-lucid

[Alexander Wirt]

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

formorer pushed a commit to branch ubuntu-lucid
in repository icinga.

commit 5efe0dfdfe8cdae02535d2f64bdd2e6c7af1cf5e
Merge: 5b55786 cc033ac
Author: Alexander Wirt <formorer at debian.org>
Date:   Wed Jul 24 20:21:31 2013 +0200

    Merge branch 'master' into ubuntu-lucid
    
    Conflicts:
    	debian/changelog

 debian/README.Debian       | 2 +-
 debian/changelog           | 9 ++++++++-
 debian/icinga-cgi.postinst | 9 +++++++--
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --cc debian/changelog
index be3970b,8b188f1..45d65d8
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,16 @@@
- icinga (1.9.3-1~ppa1~lucid1) lucid; urgency=low
++icinga (1.9.3-2~ppa1~lucid1) lucid; urgency=low
 +
 +  * Rebuild for my ubuntu ppa
 +
 + -- Alexander Wirt <formorer at debian.org>  Mon, 14 Jan 2013 22:10:43 +0100
 +
+ icinga (1.9.3-2) unstable; urgency=low
+ 
+   * [7e2d81e] Update README.Debian
+   * [35c5ef6] Fix htpasswd handling on apache < 2.4
+ 
+  -- Alexander Wirt <formorer at debian.org>  Wed, 24 Jul 2013 19:47:41 +0200
+ 
  icinga (1.9.3-1) unstable; urgency=low
  
    * [db397b3] Remove obsolete debconf po templates

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