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-03-03 20:21:05 +00:00
2010-07-25 10:35:35 +00:00
2010-08-19 04:34:08 +00:00
2009-09-12 08:36:46 +00:00
2010-08-19 04:34:14 +00:00
2011-04-16 15:38:56 -07:00
2007-09-14 11:34:08 +00:00