Merge branch 'ms/daemon-timeout-is-in-seconds'
authorJunio C Hamano <gitster@pobox.com>
Fri, 2 Sep 2011 20:17:58 +0000 (13:17 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 2 Sep 2011 20:17:58 +0000 (13:17 -0700)
commitc33e306...5b601d6707dc4022a8f64812509c7566
treea539d54...7adf7045d18727ce104bef28b639ec72copy hash to clipboard (tree)
parentb43b8a2...d33f6b19b088b505537133fc898048f6copy hash to clipboard (diff)
parentb8843ef...062cd9e0a994943f6fc86182e4ebb0eccopy hash to clipboard (diff)