From: Marcus Eggenberger <egs@quassel-irc.org>
Date: Sat, 12 Jul 2008 13:21:49 +0000 (+0200)
Subject: Merge branch 'network-sync'
X-Git-Tag: 0.3.0~275
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=a33e42aee121185f479667b2104a15fc2033762e

Merge branch 'network-sync'
---

a33e42aee121185f479667b2104a15fc2033762e