Tim Felgentreff 4b098d7774 Merge branch 'journals' into 1.0-stable ... Conflicts: app/controllers/issues_controller.rb app/controllers/journals_controller.rb app/helpers/journals_helper.rb app/views/issues/_history.rhtml lib/redmine/activity/fetcher.rb test/functional/issues_controller_test.rb test/test_helper.rb		2010-09-14 09:32:35 +02:00
..
migrate	Merge branch 'journals' into 1.0-stable	2010-09-14 09:32:35 +02:00