From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Tue, 19 Oct 2010 06:42:47 +0000 (+0200)
Subject: Merge branch 'sni'
X-Git-Tag: 0.3~1
X-Git-Url: http://www.dolda2000.com/gitweb/?p=ashd.git;a=commitdiff_plain;h=e99e87db1f197126909a3c1a944200ce5d502f92

Merge branch 'sni'
---

e99e87db1f197126909a3c1a944200ce5d502f92