From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Sun, 19 Oct 2008 15:49:50 +0000 (+0200)
Subject: Merge commit 'origin/master'
X-Git-Url: http://git.dolda2000.com/gitweb/?p=doldaconnect.git;a=commitdiff_plain;h=f512aed7b27da19b8af8643e6e93a35b4f9a1c12

Merge commit 'origin/master'
---

f512aed7b27da19b8af8643e6e93a35b4f9a1c12