Merge branch 'master' of git@git.quassel-irc.org:quassel
authorMarcus Eggenberger <egs@quassel-irc.org>
Sun, 15 Jun 2008 14:03:39 +0000 (16:03 +0200)
committerMarcus Eggenberger <egs@quassel-irc.org>
Sun, 15 Jun 2008 14:03:39 +0000 (16:03 +0200)
commitc8f0fad36b10552494f8ec3c3a45b52a3f0d2663
tree800e55bacd1cf0772fe78d36e7c34bfc1de42c9b
parentf530849ae07b8b3de58d70a5a47559ab90df43b7
parente52f9f5677fd3f547ef8ddb4ff37ff90e6d6cfed
Merge branch 'master' of git@git.quassel-irc.org:quassel