Merge branch 'master' into dcc-whiteboard
authorBernd Buschinski <b.buschinski@web.de>
Mon, 4 Jan 2010 19:28:01 +0000 (20:28 +0100)
committerBernd Buschinski <b.buschinski@web.de>
Mon, 4 Jan 2010 19:28:01 +0000 (20:28 +0100)
commit2e92014eb1d59ec4fb769f6f96e6bbbd6f97567f
treefa39cf788cfc38f0a79d927bd6d76b7f055b075b
parent66b9b4795cb5c57e7b390512340c7a7002d76b65
parent0d0869850792212a2eba94b43b299e9d69c35bee
Merge branch 'master' into dcc-whiteboard
src/irc/outputfilter.cpp