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

CHANGELOG

@@ -61,7 +61,7 @@ v 7.11.0
   - Get editing comments to work in Chrome 43 again.
   - Allow special character in users bio. I.e.: I <3 GitLab
-v 7.11.0 (unreleased)
+v 7.11.0
   - Fix broken view when viewing history of a file that includes a path that used to be another file (Stan Hu)
   - Don't show duplicate deploy keys
   - Fix commit time being displayed in the wrong timezone in some cases (Hannes Rosenögger)