Merge branch 'master' of git@git.quassel-irc.org:quassel
authorMarcus Eggenberger <egs@quassel-irc.org>
Wed, 18 Jun 2008 17:01:15 +0000 (19:01 +0200)
committerMarcus Eggenberger <egs@quassel-irc.org>
Wed, 18 Jun 2008 17:01:15 +0000 (19:01 +0200)
commit0f206dd896485276cf25025e562c812b8c7fc5da
tree0921fc49b400482c35f006c13f0b2a9d352824a5
parent08c505bd5ee36baca9ca33ee7d1adfcb01b7ab59
parent78ebc9ede7f1f96d7549c07a8f5ce55515146061
Merge branch 'master' of git@git.quassel-irc.org:quassel