[Pkg-nagios-changes] [icinga] 02/02: Fix changelog

[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 2b3f1a50fe2a7c8f4e4c718cde286cb0cc880f42
Author: Alexander Wirt <formorer at debian.org>
Date:   Sat Feb 15 21:29:14 2014 +0100

    Fix changelog
---
 debian/changelog | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 50d74aa..83fc709 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-icinga (1.10.3-1~ppa1~lucid1) lucid; urgency=low
+icinga (1.10.3-1~ppa1~quantal1) quantal; urgency=low
 
   * Rebuild for my ubuntu ppa
 
@@ -14,7 +14,6 @@ icinga (1.10.3-1) unstable; urgency=high
       (This is a fix for CVE-2014-1878)
 
  -- Alexander Wirt <formorer at debian.org>  Fri, 14 Feb 2014 09:34:15 +0100
->>>>>>> master
 
 icinga (1.10.2-1) unstable; urgency=medium
 

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