Merge branch 'master' of git@git.quassel-irc.org:quassel
authorMarcus Eggenberger <egs@quassel-irc.org>
Mon, 1 Sep 2008 19:03:08 +0000 (21:03 +0200)
committerMarcus Eggenberger <egs@quassel-irc.org>
Mon, 1 Sep 2008 19:03:08 +0000 (21:03 +0200)
commit5225cf288d73e76905f85380ec52418c3b04efee
tree1f3b1e1724d4ff1251d4bcbaa5d4cebac1cb68b5
parentea372dac8dda146255c7232922904e9f90a0d7f9
parent75b56fa155ec64fbe2a0a1a1aefe79f80646767c
Merge branch 'master' of git@git.quassel-irc.org:quassel