Merge remote branch 'origin/merlijn/finished/rcon2irc-fix'
authorRudolf Polzer <divVerent@alientrap.org>
Sat, 8 May 2010 12:50:38 +0000 (14:50 +0200)
committerRudolf Polzer <divVerent@alientrap.org>
Sat, 8 May 2010 12:50:38 +0000 (14:50 +0200)

Trivial merge