Merge branch 'js/async-thread' into next
commitbf7457c4e29684deebe2138f4adba105d8323d3d
authorJunio C Hamano <gitster@pobox.com>
Sun, 13 Jun 2010 18:23:40 +0000 (13 11:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 13 Jun 2010 18:23:40 +0000 (13 11:23 -0700)
treecc9971656c66b876848bdcbfa14b1d6cad528314
parent11ad7c908b7da9cc588ab5a3e665cc0e1ca494f0
parent3e333036ccbb97fddf54bd8fe74b12ba46f1687b
Merge branch 'js/async-thread' into next

* js/async-thread:
  fast-import: die_nicely() back to vsnprintf (reverts part of ebaa79f)
fast-import.c