Conflicts:

	app/models/auth_source_ldap.rb
	test/unit/auth_source_ldap_test.rb

Conflicts:

	app/models/auth_source_ldap.rb
	config/locales/en.yml
	test/unit/auth_source_ldap_test.rb

Based on a patch by Jean-Philippe Lang.

String#delete might break on 1.9 with dashes in the author's email address. Furthermore, String#delete doesn't do what the original author thought it does.

Contributed by David O

WikiDiff#to_html returns a string with ASCII encoding if
the WikiJournal content has been Zlib compressed because
Zlib::Inflate.inflate returns strings with ASCII encoding.
Forcing the encoding to be UTF8 fixes this bug.

Contributed by Toshi MARUYAMA

Also let the user know that the identifier must start with a lower case letter.

Contributed by Jan Schulz-Hofen.

even for sighted users

linked label where possible

added "no-css" class to overwrite the current label style

added invisible label