Merge branch 'jc/test-sleepless' into next
commit8ccf40ac43b306b75308b25c675e801eb60f3d43
authorJunio C Hamano <gitster@pobox.com>
Wed, 7 Apr 2010 22:33:34 +0000 (7 15:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 7 Apr 2010 22:33:34 +0000 (7 15:33 -0700)
tree8cffcc558652e26b0db4d9526cf12e1050da5aa5
parent701e863089733247afe0ecf7e905f3623838becd
parent016e5ff24345f974a084375da83ee143b5f2772d
Merge branch 'jc/test-sleepless' into next

* jc/test-sleepless:
  war on "sleep" in tests