From: Rudolf Polzer <divverent@xonotic.org>
Date: Mon, 7 Apr 2014 09:25:08 +0000 (+0200)
Subject: Merge branch 'master' into samual/weapons
X-Git-Tag: xonotic-v0.8.0~152^2~29^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=fca9d306878750e9523e97225c36a4237559b729;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into samual/weapons
---

fca9d306878750e9523e97225c36a4237559b729