Conflicts:
	doc/CHANGELOG.rdoc
	lib/redmine/version.rb

This will cause the class to run acts_as_journal which will create the
Journal sub-classes and prevent uninitialized constants since the sub-classes
are created on the fly.

If the Journal or the Journaled object don't save successfully,
put out the reasons why instead of aborting the migrations. Journaled
objects might failure from the :touch update, which are safe to ignore.

Contributed by MAEDA, Go

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

Contributed by Artem Naluzhnyy

Some models (Changeset) require custom options passed to
acts_as_activity_provider but acts_as_journalized wasn't accepting these
for :timestamp or :author_key

This will let them pick up the committer string if user is nil