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
..
controllers	Merge branch 'unstable' into ticket/unstable/123-journalized	2011-05-13 10:35:23 -07:00
helpers	Merge branch 'unstable' into ticket/unstable/123-journalized	2011-05-13 10:35:23 -07:00
models	Merge branch 'unstable' into ticket/unstable/123-journalized	2011-05-13 10:35:23 -07:00
views	Merge branch 'unstable' into ticket/unstable/123-journalized	2011-05-13 10:35:23 -07:00