Merge branch 'socket' into transsock

author Fredrik Tolf <fredrik@dolda2000.com>

Fri, 17 Oct 2008 23:12:36 +0000 (01:12 +0200)

committer Fredrik Tolf <fredrik@dolda2000.com>

Fri, 17 Oct 2008 23:12:36 +0000 (01:12 +0200)
author Fredrik Tolf <fredrik@dolda2000.com>
Fri, 17 Oct 2008 23:12:36 +0000 (01:12 +0200)
committer Fredrik Tolf <fredrik@dolda2000.com>
Fri, 17 Oct 2008 23:12:36 +0000 (01:12 +0200)
diff --cc daemon/fnet-dc.c
Simple merge
diff --cc daemon/net.c
Simple merge
author	Fredrik Tolf <fredrik@dolda2000.com>
	Fri, 17 Oct 2008 23:12:36 +0000 (01:12 +0200)
committer	Fredrik Tolf <fredrik@dolda2000.com>
	Fri, 17 Oct 2008 23:12:36 +0000 (01:12 +0200)
		1	2
daemon/fnet-dc.c	patch \|	diff1 \|	diff2 \|	blob \| history
daemon/net.c	patch \|	diff1 \|	diff2 \|	blob \| history