Eric Davis 216619d376 Merge branch 'unstable' into ticket/unstable/123-journalized ... Conflicts: test/unit/journal_test.rb vendor/plugins/acts_as_journalized/lib/redmine/acts/journalized/permissions.rb		2011-05-13 10:35:23 -07:00
..
migrate	Merge acts_as_journalized to unstable. #123	2011-04-23 21:25:52 +02:00
seeds.rb	[#196 #216 #216] Complete the upgrade to Rails 2.3.11	2011-05-06 15:44:38 -07:00