Automatic merge of gitlab-org/gitlab-ce master

config/unicorn.rb.example.development

@@ -58,4 +58,3 @@ after_fork do |server, worker|
   # addr = "127.0.0.1:#{9293 + worker.nr}"
   # server.listen(addr, :tries => -1, :delay => 5, :tcp_nopush => true)
 end
-