From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Fri, 21 Mar 2008 20:30:19 +0000 (+0100)
Subject: Merge branch 'socket' into transsock
X-Git-Tag: 1.3~21
X-Git-Url: http://dolda2000.com/gitweb/?p=doldaconnect.git;a=commitdiff_plain;h=96be906d7e4bf2bfa84a926e1b1b149cdd708021

Merge branch 'socket' into transsock

Conflicts:

	daemon/transfer.c
	daemon/transfer.h
---

96be906d7e4bf2bfa84a926e1b1b149cdd708021