Merge branch 'jc/test-sleepless' into next
commit9ff84b0dedb6ba9ad3565b235ade670e5562b8d9
authorJunio C Hamano <gitster@pobox.com>
Wed, 5 May 2010 00:50:12 +0000 (4 17:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 5 May 2010 00:50:12 +0000 (4 17:50 -0700)
tree65c2d609a1c9623e2f237abf2ce61ccdc1f33286
parent54c2e471a42153db019c9433c16a9a004dbc7483
parent016e5ff24345f974a084375da83ee143b5f2772d
Merge branch 'jc/test-sleepless' into next

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