From: Rudolf Polzer <divVerent@xonotic.org>
Date: Wed, 17 Aug 2011 19:59:03 +0000 (+0200)
Subject: Merge branch 'master' into divVerent/urllib-weaponstats
X-Git-Tag: xonotic-v0.5.0~111^2~4^2~7
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b2b23a889ea8112d5f1373aeb458731d62d469fb;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into divVerent/urllib-weaponstats
---

b2b23a889ea8112d5f1373aeb458731d62d469fb