Jason Gerard DeRose af7c0ee595 Resolved conficts in Rob's merge

2008-10-15 12:24:15 -06:00

..

__init__.py

Clarified docstrings in */plugins/__init__.py; renamed ipa_server/plugins/ipa_ldap.py to b_ldap.py

2008-10-01 16:17:02 -06:00

b_ldap.py

Resolved conficts in Rob's merge

2008-10-15 12:24:15 -06:00