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
..
2011-02-26 13:28:33 -08:00