703 commits

Author	SHA1	Message	Date
Joey Hess	05c4dfb941	fixup merges now done when needed	2012-06-25 20:16:30 -04:00
Joey Hess	5cfe91f06d	add a push retry thread	2012-06-25 16:38:12 -04:00
Joey Hess	0b146f9ecc	reorg threads	2012-06-25 16:10:24 -04:00