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

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

Conflicts:
	Makefile
---

907668bd5063ebf8c4e2c11abcbd6cb46880808d
diff --cc Makefile
index 027ae44,5d43fa0..01b915d
--- a/Makefile
+++ b/Makefile
@@@ -1,6 -1,5 +1,5 @@@
 -VERSION		= 0.24
 -RELEASE		= 4
 +VERSION		= 0.24 
 +RELEASE		= 5 
- NEWRELEASE	= $(shell echo $$(($(RELEASE) + 1)))
  PYTHON		= /usr/bin/python
  
  MESSAGESPOT=po/messages.pot