![[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) |
* ms/daemon-timeout-is-in-seconds:
git-daemon.txt: specify --timeout in seconds
git-daemon.txt: specify --timeout in seconds
Trivial merge