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

[#733] Add Issue#due_today? and add due-today css class

[#761] Fix quotation of since date in git adapter

Bug #708: AAJ does not create journals, when models are created using sub classes

Encloses since date in single quotes. This was causing git to respond with fatal: Unknown Object and preventing revisions from being updated. 

* Won't output errors when the ChiliProject git repo isn't there anymore,
* Works even if not invoked from the ChiliProject root directory,
* Moved the formatting logic to the git call.

The cache did not distinguish between cached credentials for read and write
access. As it does not check permissions again if there is a cache hit, users
with authorization for either reading or writing could poison the cache and
subsequently authorize themselves for both access types.

Original fix is by Jean-Philippe Lang, http://www.redmine.org/issues/9567

Based on a patch by Jean-Philippe Lang.

Based on a patch by Jean-Philippe Lang.

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.

Only that version introduced the mingw platforms we use in our Gemfile.

[#725] Compatibility check for jQuery availability (master)

Added Bulgarian translation of several strings

In the current master a.k.a. ChiliProject 2.x, there is
no jQuery loaded by core.

[#711] Fix TabularFormBuilder on Ruby 1.9

This is actually a bug in rails 2.3.14 on ruby 1.9 -- Felix

[#707] Fix encoding error on wiki diffs on Ruby 1.9

[124] delete registered users

[#698] Fix single-value query atoms in issue queries on Ruby 1.9

Contributed by David O

this way journal classes are only created for classes with
calls to acts_as_journalized. You may now subclass journaled models to extend them with helper methods in plugins w/o interfering with aaj.

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.