Merge remote branch 'refs/remotes/origin/merlijn/rcon2irc-fix'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 24 Aug 2010 03:30:51 +0000 (05:30 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 24 Aug 2010 03:30:51 +0000 (05:30 +0200)

Trivial merge