From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Sat, 21 Jul 2007 03:51:02 +0000 (+0200)
Subject: Merge branch 'dolcon-split'
X-Git-Tag: 1.0~106
X-Git-Url: http://git.dolda2000.com/gitweb/?p=doldaconnect.git;a=commitdiff_plain;h=d05758f6eda21695e6215d60d28b9747d0b8aaa3

Merge branch 'dolcon-split'

Conflicts:

	po/sv.po
---

d05758f6eda21695e6215d60d28b9747d0b8aaa3