Merge branch 'patch-2' of git://github.com/rivendale2010/diaspora into develop

Conflicts:
	Changelog.md
	app/views/layouts/_header.html.haml

Changelog.md

@@ -139,6 +139,7 @@ everything is set up.
 * Missing translation "Back to top". [#4138](https://github.com/diaspora/diaspora/pull/4138)
 * Fix preview with locator feature. [#4147](https://github.com/diaspora/diaspora/pull/4147)
 * Fix mentions at end of post. [#3746](https://github.com/diaspora/diaspora/issues/3746)
+* Fix missing indent to correct logged-out-header container relative positioning [#4134](https://github.com/diaspora/diaspora/pull/4134)
 
 ## Features
 

app/views/layouts/_header.html.haml

@@ -5,10 +5,10 @@
 %header
     - unless current_user
         .container{:style => "position:relative;"}
-        = link_to content_tag(:div, nil, :class => 'branding-logo_small'), root_path
+            = link_to content_tag(:div, nil, :class => 'branding-logo_small'), root_path
 
-        %ul#landing_nav
-            %li= link_to '@joindiaspora', "http://twitter.com/joindiaspora"
-            %li= link_to 'github', "https://github.com/diaspora/diaspora"
-            %li= link_to t('.blog'), 'http://blog.diasporafoundation.org/'
-            %li= link_to t('.login'), new_user_session_path, :class => 'login'
+            %ul#landing_nav
+                %li= link_to '@joindiaspora', "http://twitter.com/joindiaspora"
+                %li= link_to 'github', "https://github.com/diaspora/diaspora"
+                %li= link_to t('.blog'), 'http://blog.diasporafoundation.org/'
+                %li= link_to t('.login'), new_user_session_path, :class => 'login'