Merge branch 'master' of github.com:rohe/pysaml2

Conflicts:
	src/saml2/__init__.py

Author: Roland Hedberg

README.rst

@@ -3,7 +3,7 @@ PySAML2 - SAML2 in Python
 *************************
 
 :Author: Roland Hedberg
-:Version: 3.0.0
+:Version: 4.0.4
 
 PySAML2 is a pure python implementation of SAML2. It contains all
 necessary pieces for building a SAML2 service provider or an identity provider.

src/saml2/__init__.py

@@ -17,7 +17,7 @@
     provides methods and functions to convert SAML classes to and from strings.
 """
 
-__version__ = "4.0.4rc1"
+__version__ = "4.0.4"
 
 import logging
 import six