Merge branch 'master' into xchat
authorChristian Thaeter <ct@pipapo.org>
Mon, 5 Nov 2007 07:19:25 +0000 (08:19 +0100)
committerChristian Thaeter <ct@pipapo.org>
Mon, 5 Nov 2007 07:19:25 +0000 (08:19 +0100)
commit5ce405d84c9747868398cdea19ff1ee13ff61414
tree618b073919e2c5c065bc944d96e1ed2cb5b7b8af
parentde03ebb870c0e8e6902f58703f04e1f831d766fc
parente33a5dab5dac218f79f97dd6c24ce6ad06527486
Merge branch 'master' into xchat