Merge branch 'jc/racy-delay'
authorJunio C Hamano <junkio@cox.net>
Sun, 13 Aug 2006 02:41:44 +0000 (19:41 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 13 Aug 2006 02:41:44 +0000 (19:41 -0700)
commitc1e4572b7d3447949ed2da1ab290217a70cf3933
tree0d1fdd615e6d442f89bde5791aef87ea39fc6205
parentf3c5b39567535a41a371aad8a6affbeea0d4c0b9
parent6015c28b1d6163f124332769989326ee470afbb6
Merge branch 'jc/racy-delay'