split_node_tags: Merge changes from main branch.

[rails.git] / app / views / layouts / site.rhtml

diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml
index db7fce0a6a25b975d7eeb3bd15a8c12789274ef6..33e02449d7dcab70a16a1347e26ec9ada740c3ea 100644 (file)
--- a/app/views/layouts/site.rhtml
+++ b/app/views/layouts/site.rhtml
@@ -95,6 +95,12 @@
         <%= yield :left_menu %>
       </div>
 
+      <div id="sotm" class="left_menu">
+        <div id="sotminfo">
+        Come to the second OpenStreetMap Conference, <a href="http://www.stateofthemap.org">The State of the Map</a>: 12th-13th July 2008, Limerick, Ireland.
+        </div>
+      </div>
+
       <%= yield :optionals %>
       <div id="cclogo">
         <center>