Conflicts:
	.gitignore
	Gemfile
	app/helpers/repositories_helper.rb
	app/views/custom_fields/_form.rhtml
	app/views/wiki/annotate.rhtml
	app/views/wiki/diff.rhtml
	app/views/wiki/show.rhtml
	extra/svn/Redmine.pm

Conflicts:
	.gitignore
	app/controllers/application_controller.rb
	app/helpers/application_helper.rb
	app/helpers/calendars_helper.rb
	app/helpers/queries_helper.rb
	app/helpers/reports_helper.rb
	app/helpers/sort_helper.rb
	app/views/common/_diff.rhtml
	app/views/common/error.html.erb
	app/views/help/wiki_syntax_detailed.html.erb
	app/views/projects/show.rhtml
	app/views/reports/_details.rhtml
	app/views/reports/_simple.rhtml
	app/views/repositories/_dir_list_content.rhtml
	app/views/search/index.rhtml
	app/views/versions/_issue_counts.rhtml
	app/views/versions/index.html.erb
	doc/CHANGELOG.rdoc
	lib/redmine/scm/adapters/subversion_adapter.rb
	lib/redmine/version.rb
	test/unit/lib/redmine/wiki_formatting/textile_formatter_test.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.

Rails 2.3 doesn't work well as a rack-only app

It completely breaks on Ruby 1.9.3-p0. This is a stopper for people installing all groups. For the rest it is rarely used at all. Developers and testers requiring it can include it into their Gemfile.local

Update git command for initialization of repositories with the --bare option
Change syncing git repositories command from 'git clone' to 'git fetch'

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