From: Rudolf Polzer Date: Tue, 24 Aug 2010 03:30:51 +0000 (+0200) Subject: Merge remote branch 'refs/remotes/origin/merlijn/rcon2irc-fix' X-Git-Tag: xonotic-v0.1.0preview~271 X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=731e4a4f460f11c87d562f30b5d43a953a9c96bb Merge remote branch 'refs/remotes/origin/merlijn/rcon2irc-fix' --- 731e4a4f460f11c87d562f30b5d43a953a9c96bb