From d355ec58e46786b05e64cc712ad4f2f3bf3c6f9e Mon Sep 17 00:00:00 2001
From: daniel evertsson <daniel.evertsson@umu.se>
Date: Mon, 21 Sep 2015 14:34:28 +0200
Subject: [PATCH] Merge branch 'master' of https://github.com/its-dirg/pysaml2

Conflicts:
	example/idp2/idp.py
	src/saml2/mdstore.py
---
 example/requirements.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/example/requirements.txt b/example/requirements.txt
index ecfc140..588621c 100644
--- a/example/requirements.txt
+++ b/example/requirements.txt
@@ -1,3 +1,2 @@
-python-ldap
 mako
 cherrypy
\ No newline at end of file