From: Tom Hughes <tom@compton.nu>
Date: Sun, 17 Oct 2010 10:02:11 +0000 (+0100)
Subject: Merge branch 'master' into openstreetbugs
X-Git-Tag: live~5153^2~202
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/a1cb0f04d476101116087286ff072d3a137355cb

Merge branch 'master' into openstreetbugs

Conflicts:
	app/views/site/index.html.erb
---

a1cb0f04d476101116087286ff072d3a137355cb
diff --cc app/views/site/index.html.erb
index fc1e1ec5c,a89212238..305df63c0
--- a/app/views/site/index.html.erb
+++ b/app/views/site/index.html.erb
@@@ -17,12 -17,12 +17,13 @@@
  </noscript>
  
  <div id="map">
-   <div id="permalink">
-     <a href="/" id="permalinkanchor"><%= t 'site.index.permalink' %></a><br/>
-     <a href="/" id="shortlinkanchor"><%= t 'site.index.shortlink' %></a><br/>
- 	<a id="ReportBug">Report a problem</a>	
-   </div>
- </div> 
+ </div>
+ 
+ <div id="permalink">
+   <a href="/" id="permalinkanchor"><%= t 'site.index.permalink' %></a><br/>
 -  <a href="/" id="shortlinkanchor"><%= t 'site.index.shortlink' %></a>
++  <a href="/" id="shortlinkanchor"><%= t 'site.index.shortlink' %></a><br/>
++  <a href="/" id="ReportBug">Report a problem</a>	
+ </div>
  
  <div id="attribution">
    <table width="100%">