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)

Trivial merge