Conflicts:

	app/helpers/calendars_helper.rb
	app/helpers/issues_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/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

Merged from master 70c3e1c8

Conflicts:

	app/helpers/application_helper.rb

move protect_from_forgery to the beginning of the before_filter chain as per the recommended rails practices

Merged from master d7a9adf8

Conflicts:

	app/controllers/application_controller.rb

Contributed by MAEDA, Go

* Allows plugins to add to the list of supported export formats at the
  bottom of the Wiki#show view template

Based on a patch contributed by Price M.

Contributed by Alf Gaida

[#374] Not escaping URLs since they are used in a safe CDATA section, where no entity encoding is needed.

hoping to make it more intention revealing

Execution After Redirect (EAR) happens when redirect in a controller is
triggered but there still is code that is executed in the action.

Contributed by Adam Doupé

Contributed by Robert Chady

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4811 e93f8b46-1217-0410-a6f0-8f06a7374b81

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4817 e93f8b46-1217-0410-a6f0-8f06a7374b81

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4816 e93f8b46-1217-0410-a6f0-8f06a7374b81

Contributed by Yuki Sonoda

Using SQL CAST() to convert the issue ids to strings so LIKE will work
properly.