Eric Davis cd64d11e17 Merge branch 'master' into unstable ... Conflicts: app/controllers/watchers_controller.rb app/views/issues/_action_menu.rhtml config/locales/pt-BR.yml doc/CHANGELOG.rdoc lib/redmine/export/pdf.rb lib/redmine/wiki_formatting/textile/helper.rb		2011-05-27 12:20:04 -07:00
..
controllers	Merge branch 'master' into unstable	2011-05-27 12:20:04 -07:00
helpers	Merge branch 'master' into unstable	2011-05-27 12:20:04 -07:00
models	Fix SearchController tests.	2011-05-25 16:40:34 +02:00
views	Merge branch 'master' into unstable	2011-05-27 12:20:04 -07:00