Merge branch '0.2' of git@git.quassel-irc.org:quassel into 0.2
authorMarcus Eggenberger <egs@quassel-irc.org>
Wed, 18 Jun 2008 17:01:05 +0000 (19:01 +0200)
committerMarcus Eggenberger <egs@quassel-irc.org>
Wed, 18 Jun 2008 17:01:05 +0000 (19:01 +0200)
commit64f644c269f3aaf67624bf05e18ee762f2deaec8
treeca753308b550e015e057f82c4e7ac2bbd4482890
parent83c7b83218f2586180dcb22c272efc125ee6a1d3
parentd7fc6b8c2d624814bf66f004181d93f4f4889bee
Merge branch '0.2' of git@git.quassel-irc.org:quassel into 0.2