Merge branch 'master' of github.com:diaspora/diaspora

public/stylesheets/sass/application.sass

@@ -44,7 +44,7 @@ ul > li
 form
   :position relative
   input,
-  textarea
+  textarea,
   label
     :font
       :size auto
@@ -498,8 +498,8 @@ ul.as-selections
   .stream_element
     .content
       p
-      :font
-        :size 1em
+        :font
+          :size 1em
 
   .comment_box
     :width 653px