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

Added view hook for additional wiki formats [refs #488]

Conflicts:
	app/views/help/wiki_syntax_detailed.html.erb
	public/favicon.ico