Eric Davis bdc7325a82 Merge branch 'master' into unstable ... Conflicts: doc/CHANGELOG.rdoc		2011-05-01 13:58:02 -07:00
..
controllers	Merge branch 'master' into unstable	2011-05-01 13:58:02 -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