Eric Davis 30bcd6c66b Merge branch 'master' into release-v2.0.0 ... Conflicts: doc/CHANGELOG.rdoc lib/redmine/version.rb		2011-07-01 21:46:38 -07:00
..
controllers	[#398] Remove helpers from IssuesController	2011-06-17 14:46:09 -07:00
helpers	[#436] Remove trailing whitespace	2011-05-30 20:52:25 +02:00
models	[#501] Ugly patch to stop creating journals when only line endings change	2011-07-01 12:25:07 -07:00
views	Merge branch 'master' into release-v2.0.0	2011-07-01 21:46:38 -07:00