Merge branch 'jk/upload-pack-keepalive' into maint

* jk/upload-pack-keepalive: upload-pack: bump keepalive default to 5 seconds upload-pack: send keepalive packets during pack computation

Junio C Hamano committed Oct 17, 2013 at 15:46 UTC 9432c6aaa5d58d433b6e3e139998733d2e87d946

No changes.