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

Conflicts:
	Makefile

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