From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Wed, 9 Mar 2011 00:18:16 +0000 (+0100)
Subject: Merge branch 'master' into sslres
X-Git-Tag: 0.7~1
X-Git-Url: http://www.dolda2000.com/gitweb/?p=ashd.git;a=commitdiff_plain;h=4d2dc22a9a68395a5788ae66c84ae0ced2d0e733

Merge branch 'master' into sslres
---

4d2dc22a9a68395a5788ae66c84ae0ced2d0e733