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
..
2010-10-15 23:11:05 +00:00
2010-08-19 04:32:06 +00:00