From: Adrian Likins <alikins@redhat.com>
Date: Sat, 21 Feb 2009 05:39:32 +0000 (-0500)
Subject: Merge branch 'master' of ssh://alikins@git.fedorahosted.org/git/certmaster
X-Git-Tag: v0.25~13
X-Git-Url: https://pwan.org/git/?p=certmaster.git;a=commitdiff_plain;h=907668bd5063ebf8c4e2c11abcbd6cb46880808d;hp=a900ddc0bc93714a22d219623bf65d6ac10be71f

Merge branch 'master' of ssh://alikins@git.fedorahosted.org/git/certmaster

Conflicts:
	Makefile
---

diff --git a/Makefile b/Makefile
index 5d43fa0..01b915d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-VERSION		= 0.24
-RELEASE		= 4
+VERSION		= 0.24 
+RELEASE		= 5 
 PYTHON		= /usr/bin/python
 
 MESSAGESPOT=po/messages.pot
diff --git a/certmaster.spec b/certmaster.spec
index 3c90f4d..e03ec78 100644
--- a/certmaster.spec
+++ b/certmaster.spec
@@ -17,7 +17,7 @@
 Summary: Remote certificate distribution framework
 Name: certmaster
 Version: 0.24 
-Release: 4%{?dist}
+Release: 5%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
 Group: Applications/System
@@ -130,7 +130,7 @@ fi
 
 
 %changelog
-* Wed Feb 18 2009 Adrian Likins <alikins@redhat.com> - 0.24.4
+* Wed Feb 18 2009 Adrian Likins <alikins@redhat.com> - 0.24.5
 - remove version file
 
 * Mon Jan 19 2009 Adrian Likins <alikins@redhat.com> - 0.24.4