Merge branch 'master' of git://git.openstreetmap.org/rails into openstreetbugs

diff --cc app/views/browse/_map.html.erb
Simple merge

diff --cc config/environment.rb
Simple merge

diff --cc config/locales/en.yml
index abec2d991f1af9fce042d66e9070fc39ee628cf2,ba76a9b4afd04e945860a259fce22f48f201e70c..7e9046c4f75948484273a77f7e1e156cbe27ca55
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -252,19 -262,8 +262,19 @@@ en
        download_xml: "Download XML"
        view_history: "view history"
        edit: "edit"
 +    bug:
 +      open_title: "Unresolved issue: {{bug_name}}"
 +      closed_title: "Resolved issue: {{bug_name}}"
 +      created_at: "Created at:"
 +      edited_at: "Edited at:"
 +      closed_at: "Closed at:"
 +      opened_by: "Opened by:"
 +      description: "Description:"
 +      comment_by: "Comment by: "
 +      comment: "Comment:"
 +      date: "Date:"
    changeset:
-     changeset_paging_nav: 
+     changeset_paging_nav:
        showing_page: "Showing page {{page}}"
        next: "Next »"
        previous: "« Previous"

diff --cc config/routes.rb
Simple merge