Merge branch 'ew/daemon-socket-keepalive' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Jun 2016 16:56:22 +0000 (09:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Jun 2016 16:56:22 +0000 (09:56 -0700)
commit0a20325...01d089d8274aa4be05d79e6c157e1319
tree6387b48...e601db9936bd788783c2f8e79fd7867fcopy hash to clipboard (tree)
parent05219a1...76341e72d8082d76b7f5ed394b7437a4copy hash to clipboard (diff)
parenta43b68a...96652a0c6b054ee4905ac98d1cdcbbb9copy hash to clipboard (diff)