![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 2 Sep 2011 20:17:58 +0000 (13:17 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 2 Sep 2011 20:17:58 +0000 (13:17 -0700) | ||
| commit | c33e30675b601d6707dc4022a8f64812509c7566 | |
| tree | a539d5437adf7045d18727ce104bef28b639ec72 | tree | snapshot |
| parent | b43b8a20d33f6b19b088b505537133fc898048f6 | commit | diff |
| parent | b8843efc062cd9e0a994943f6fc86182e4ebb0ec | commit | diff |
Merge branch 'ms/daemon-timeout-is-in-seconds'
* ms/daemon-timeout-is-in-seconds:
git-daemon.txt: specify --timeout in seconds
* ms/daemon-timeout-is-in-seconds:
git-daemon.txt: specify --timeout in seconds