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

Conflicts:
	Makefile

diff --cc Makefile
index 027ae44,5d43fa0..01b915d
--- 1/Makefile
--- 2/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