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

Merge branch 'socket' into transsock
---

363c7059ebeac9d54a372a26737e2235d849eae5