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]

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

  undefined method `logged?' for nil:NilClass

Using 3c2ef2757165e23b65fd from
https://github.com/edavis10/squeejee_theme/tree/chiliproject.org

This should avoid deprecation warnings when using ChiliProject with Rake 0.9

http://www.flickr.com/photos/thebrownhouse/4599233853/sizes/l/

Based on a patch contributed by Price M.

Contributed by Alf Gaida

Rename plugin generators to ChiliProject. #324

pt-BR updates. #326

Don't HTML-escaped URLs before passing them to the JavaScript helper. #374

Avoid duplicates in issue autocomplete. #373

Fix html_title usage in help views for Ruby 1.9. #379

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