Merge branch 'js/daemon-test-race-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 7 May 2012 20:17:17 +0000 (13:17 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 7 May 2012 20:17:17 +0000 (13:17 -0700)
commit6a88021...4675b69b927ce1aa9c4dddc5dc621232
treef5d564c...98d87857c31909c714df3a67365c06b0copy hash to clipboard (tree)
parent4c8ad06...7c20741c7330ff791e06ef20142c91e4copy hash to clipboard (diff)
parent46e3581...8109200abde4de0a044a415c80c9bce5copy hash to clipboard (diff)