Conflicts:
	app/helpers/repositories_helper.rb

Conflicts:
	app/views/wiki/annotate.rhtml
	app/views/wiki/diff.rhtml
	app/views/wiki/show.rhtml

move protect_from_forgery to the beginning of the before_filter chain as per the recommended rails practices

Use the equivalent db:migrate:plugins instead that is provided by the
engines plugin directly.

Fix failing tests because of missing journal fixtures and indeterministic behaviour of .find(:first)

Contributed by Ivan Cenov.

Contributed by Jan Schulz-Hofen

Contributed by Holger Just