Conflicts:
	app/controllers/watchers_controller.rb
	app/views/issues/_action_menu.rhtml
	config/locales/pt-BR.yml
	doc/CHANGELOG.rdoc
	lib/redmine/export/pdf.rb
	lib/redmine/wiki_formatting/textile/helper.rb

* Allows for format extensions in plugins w/o giving a double-render
  error
* Updated Wiki#show template to specify 'wiki/sidebar' explicitly
  (vs. just 'sidebar')

  undefined method `logged?' for nil:NilClass

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

The "dd" the removed assert_tag part was supposed to find should never show up on the page in the first place (it's in a journal, not in the issue itself).

This should avoid deprecation warnings when using ChiliProject with Rake 0.9

acts_as_journalized called changes as per ActiveRecord::Dirty 
(see http://ar.rubyonrails.org/classes/ActiveRecord/Dirty.html#M000291), 
the journalized model Changeset :has_many changes though, which 
made the call return a list of associated objects instead of the 
intended list of changed attributes. Replaced changes with the code
from AR::Dirty to work around that.

Iconv on jRuby does not accept an empty string as "from" encoding.
Use the default behavior from the controller instead to leave it
unspecified and thuse use UTF-8.

acts_as_journalized changed the interfaces and didn't include all of
the recent changes to the Journals system.

* removed Journal diffs, acts_as_journalized handles them differently
* fixed the Journal atom feed
* added the journal preview back in
* added missing tests

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

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