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

app/views/shared/_no_ssh.html.haml

 - if current_user.require_ssh_key?
   %h6.error_message
     %span
-      You wont be able to pull/push project code unless you
+      You won't be able to pull or push project code until you
       %strong
         = link_to new_key_path, class: "vlink" do
-          add SSH key
+          add a SSH key
       to your profile