From: Manuel Nickschas Date: Mon, 19 May 2008 20:46:09 +0000 (+0000) Subject: Merge branch 'master' of sputnick@git.quassel-irc.org:quassel X-Git-Tag: 0.3.0~415 X-Git-Url: https://git.quassel-irc.org/?a=commitdiff_plain;h=d9b51624b0e22629e574a88473a9b78a65314e91;hp=d9b51624b0e22629e574a88473a9b78a65314e91;p=quassel.git Merge branch 'master' of sputnick@git.quassel-irc.org:quassel ---