From: Rudolf Polzer <divVerent@alientrap.org>
Date: Sat, 8 May 2010 12:50:38 +0000 (+0200)
Subject: Merge remote branch 'origin/merlijn/finished/rcon2irc-fix'
X-Git-Tag: xonotic-v0.1.0preview~469
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=5349707ed01190c963b8fdbedcdbaf4d28fc61d9

Merge remote branch 'origin/merlijn/finished/rcon2irc-fix'
---

5349707ed01190c963b8fdbedcdbaf4d28fc61d9