From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Fri, 17 Oct 2008 23:12:36 +0000 (+0200)
Subject: Merge branch 'socket' into transsock
X-Git-Tag: 1.3~11
X-Git-Url: http://git.dolda2000.com/gitweb/?a=commitdiff_plain;h=5760093c6a76eee741d70f8b8d71e9e52bd655ee;p=doldaconnect.git

Merge branch 'socket' into transsock
---

5760093c6a76eee741d70f8b8d71e9e52bd655ee