Merge branch 'jc/test-sleepless'
commit301c4f970913fc52be7a6b667fb5a4945e9276d0
authorJunio C Hamano <gitster@pobox.com>
Sun, 9 May 2010 05:36:23 +0000 (8 22:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 9 May 2010 05:36:23 +0000 (8 22:36 -0700)
tree8652467db21d479e084282c86e1c0301286d7524
parenta9eb30412942224c1494357f495b8b2a4b3d46b8
parent016e5ff24345f974a084375da83ee143b5f2772d
Merge branch 'jc/test-sleepless'

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