Merge branch '0.2' of git@git.quassel-irc.org:quassel into 0.2
authorAlexander von Renteln <phon@quassel-irc.org>
Fri, 6 Jun 2008 09:32:50 +0000 (11:32 +0200)
committerAlexander von Renteln <phon@quassel-irc.org>
Fri, 6 Jun 2008 09:32:50 +0000 (11:32 +0200)
commit058523b5b53cfcc0291747065ad1a1390e3b3f03
treecb6e3af9e7ee3310829f8e5019196567b499740b
parent30c42dbf858b9ce54518bd1ccc79e195a3a6421a
parent536ef19e7f9487db60ae3a99494d8b2870b13cff
Merge branch '0.2' of git@git.quassel-irc.org:quassel into 0.2