[Pkg-nagios-changes] [SCM] debian packaging of icinga(-core) branch, ubuntu-lucid, updated. debian/1.9.1-1-14-g2100a65

[Alexander Wirt]

The following commit has been merged in the ubuntu-lucid branch:
commit 2e87f8cf3df4ba7fa52460bbbedfea3fff7131f9
Author: Alexander Wirt <formorer at debian.org>
Date:   Wed May 8 07:11:31 2013 +0200

    Fix changelog

diff --git a/debian/changelog b/debian/changelog
index 218acf0..643e046 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,7 +21,6 @@ icinga (1.9.0-1) unstable; urgency=low
   * [bbaa9f6] Recommend icinga-docs in the icinga metapackage (Closes: #682359)
 
  -- Alexander Wirt <formorer at debian.org>  Tue, 07 May 2013 16:18:34 +0200
->>>>>>> master
 
 icinga (1.8.4-1) experimental; urgency=high
 

-- 
debian packaging of icinga(-core)