Merge branch 'master' of https://github.com/its-dirg/pysaml2

daniel evertsson · daniel evertsson · commit d355ec58e467 · 2015-09-21T14:34:28.000+02:00
Conflicts:
	example/idp2/idp.py
	src/saml2/mdstore.py
diff --git a/example/requirements.txt b/example/requirements.txt
@@ -1,3 +1,2 @@
-python-ldap
 mako
 cherrypy
