Merge branch '0.2' of git@git.quassel-irc.org:quassel into 0.2
authorMarcus Eggenberger <egs@quassel-irc.org>
Mon, 16 Jun 2008 14:38:46 +0000 (16:38 +0200)
committerMarcus Eggenberger <egs@quassel-irc.org>
Mon, 16 Jun 2008 14:38:46 +0000 (16:38 +0200)
commit792196c0b037cdbc230900f8776a048da95dc29d
treee7e7dd1a2d54e7524d035ffc61ec2875c2ae4834
parent6c3b43eeecfe735723e171852ae8a4d649fa2c18
parent5074fc624f6b7a69f8784bdb922c55bdbfb9f314
Merge branch '0.2' of git@git.quassel-irc.org:quassel into 0.2