Merge branch 'master' of git@git.quassel-irc.org:quassel
authorMarcus Eggenberger <egs@quassel-irc.org>
Mon, 16 Jun 2008 14:38:55 +0000 (16:38 +0200)
committerMarcus Eggenberger <egs@quassel-irc.org>
Mon, 16 Jun 2008 14:38:55 +0000 (16:38 +0200)
commit613850196857c7e29b0ef5c09175aadb9492642d
tree7ac9753758fcfeeb4d7281eb87df3ba63c45b1eb
parent556549cdf3058189d2439ac58ded7c39e69e94d7
parent4bee97e877d9ba4677ab90456377822da6203e29
Merge branch 'master' of git@git.quassel-irc.org:quassel