Conflicts:

	app/controllers/documents_controller.rb

This will prevent the usage of the wrong wiki_content status.

The code is not overly pretty and deserves a thorough refactoring, but at
least it solves the problem at hand.

We programmers have a nice new years tradition: We revisit all of our
projects and add 1 to a small number near a "(c)".

-- Volker Dusch
https://twitter.com/__edorian/status/153801913442373633

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