Merge branch 'xchat'
authorChristian Thaeter <ct@pipapo.org>
Tue, 6 Nov 2007 22:29:05 +0000 (23:29 +0100)
committerChristian Thaeter <ct@pipapo.org>
Tue, 6 Nov 2007 22:29:05 +0000 (23:29 +0100)
commit5da559711f15c81371775e5014a0906b5946ef86
tree2e438e016e05d45901b91fa24b20cc35779b5090
parent221742f8b9ecab50d648490e1428f060972ac3a6
parentdeabb88a5a192cb9e6e54031da44837fe6b5d31d
Merge branch 'xchat'