Merge branch 'ms/daemon-timeout-is-in-seconds'
commitc33e30675b601d6707dc4022a8f64812509c7566
authorJunio C Hamano <gitster@pobox.com>
Fri, 2 Sep 2011 20:17:58 +0000 (2 13:17 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 2 Sep 2011 20:17:58 +0000 (2 13:17 -0700)
treea539d5437adf7045d18727ce104bef28b639ec72
parentb43b8a20d33f6b19b088b505537133fc898048f6
parentb8843efc062cd9e0a994943f6fc86182e4ebb0ec
Merge branch 'ms/daemon-timeout-is-in-seconds'

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