Merge branch 'js/daemon-test-race-fix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 30 Apr 2012 00:52:02 +0000 (17:52 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 30 Apr 2012 00:52:03 +0000 (17:52 -0700)
commita75aba4...5306d0fee6a8ee8b48943e2c19eb2750
tree1c02532...d5104e7621b4abb040806cc805c12a52copy hash to clipboard (tree)
parent55375e9...736ba47a264ec0437fc723b2ed80919ccopy hash to clipboard (diff)
parent46e3581...8109200abde4de0a044a415c80c9bce5copy hash to clipboard (diff)