From: Jan Behrens <zykure@web.de>
Date: Wed, 16 Jan 2013 18:46:08 +0000 (+0100)
Subject: Merge branch 'master' into approved.new
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=51cb9c393c6c612c4f4cd1e20b62e727986c78e3;p=xonotic%2Fxonstat.git

Merge branch 'master' into approved.new
---

51cb9c393c6c612c4f4cd1e20b62e727986c78e3