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