Merge branch 'ms/daemon-timeout-is-in-seconds'

* ms/daemon-timeout-is-in-seconds: git-daemon.txt: specify --timeout in seconds

Junio C Hamano committed Sep 2, 2011 at 13:17 UTC c33e30675b601d6707dc4022a8f64812509c7566

No changes.