Eric Davis 614bad89a5 Merge branch 'ticket/unstable/310-skip-issue-mail-notifications' into unstable ... Conflicts: config/locales/en.yml test/unit/journal_test.rb		2011-04-29 08:46:13 -07:00
..
controllers	Merge branch 'ticket/unstable/310-skip-issue-mail-notifications' into unstable	2011-04-29 08:46:13 -07:00
helpers	Merge branch 'ticket/unstable/310-skip-issue-mail-notifications' into unstable	2011-04-29 08:46:13 -07:00
models	Merge branch 'ticket/unstable/310-skip-issue-mail-notifications' into unstable	2011-04-29 08:46:13 -07:00
views	Merge branch 'ticket/unstable/310-skip-issue-mail-notifications' into unstable	2011-04-29 08:46:13 -07:00