Merge remote-tracking branch 'origin/master'

Conflicts:
	MANIFEST
master
nanu2 2014-09-16 12:57:26 +02:00
commit 1fa0163d01
1 changed files with 0 additions and 11 deletions

View File

@ -1,11 +0,0 @@
# file GENERATED by distutils, do NOT edit
CHANGES.txt
LICENSE.txt
MANIFEST.in
setup.py
ldappr/__init__.py
ldappr/api.py
ldappr/connection.py
ldappr/ldapprobject.py
ldappr/test/__init__.py
ldappr/test/test_ldappr.py