# Conflicts:
#	lib/gitlab/ldap/access.rb
#	lib/gitlab/ldap/adapter.rb
#	lib/gitlab/ldap/config.rb
#	lib/gitlab/ldap/person.rb
#	lib/gitlab/ldap/user.rb
#	lib/gitlab/o_auth/auth_hash.rb
#	lib/gitlab/o_auth/user.rb
#	lib/gitlab/saml/config.rb
#	lib/gitlab/saml/user.rb
#	spec/lib/gitlab/auth/ldap/access_spec.rb
#	spec/lib/gitlab/auth/ldap/user_spec.rb