From: Rudolf Polzer <divverent@alientrap.org>
Date: Fri, 10 Sep 2010 21:23:17 +0000 (+0200)
Subject: Merge remote branch 'refs/remotes/origin/mrbougo/rcon2irc_fix'
X-Git-Tag: xonotic-v0.1.0preview~233
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=898ec1745ef1d81e7fa083ec7fdd5e1f9bfd7a09

Merge remote branch 'refs/remotes/origin/mrbougo/rcon2irc_fix'
---

898ec1745ef1d81e7fa083ec7fdd5e1f9bfd7a09