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

Conflicts:
	lib/redmine/scm/adapters/subversion_adapter.rb

  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