Conflicts:
	app/views/layouts/_project_menu.html.haml

This makes gitlabhq compatible with more LDAP servers (specifically OpenLDAP).

Conflicts:
	.gitignore

Fixes :public Warning In Resque When Running Any Rails Command

This helps with compatibility with more LDAP providers as the implementation
doesn't depend on the exact names of the LDAP fields. The LDAP strategy
helps maps the attributes to the fields in the info object and we use the
info object to get the email and name.

This makes the LDAP auth compatible with most OpenLDAP servers as well.