reapplied LDAP code to current upstream
setup.py: added 'python-ldap' to install_requires
auth.py: removed some trailing whitespace
forgot 2 lines in user.py
only display "reset password" link for non-external users
undid 1b93d9b583852c7c8e64fd938d02d0d26fc8cbab
only display LDAP settings if python-ldap is installed
Tools for sws2rst
Merge remote-tracking branch 'sagemath/master' into sws2rst
Trac 10637 reviewer patch

More accurate error message if BeautifulSoup is not installed
Merge branch 'master' into ldap
disable LDAP automatically if import fails
Merge branch 'master' into ldap
Merge branch 'master' into ldap
#12415: Fix some doctests in sagenb
user_manager: made _user_lookup() handle a returned None gracefully
LdapAuth: made user_lookup return None if import ldap fails
use set(), not {}
Merge branch 'master' into ldap
Merge branch 'ldap' of ssh://github.com/rmartinjak/sagenb into ldap