Merge branch 'master' of github.com:gitlabhq/gitlabhq into...

Merge branch 'master' of github.com:gitlabhq/gitlabhq into arthurschreiber-use_redcarpet_for_markdown

app/views/notes/_form.html.haml

@@ -29,7 +29,7 @@
           %div.file_name File name...
           %button.file_upload.btn.small Upload File
           .input= f.file_field :attachment, :class => "input-file"
-        %span Any file less then 10 MB
+        %span Any file less than 10 MB
   = f.submit 'Add Comment', :class => "btn primary", :id => "submit_note"