From: Rudolf Polzer <divverent@xonotic.org>
Date: Sat, 27 Jul 2013 09:35:02 +0000 (+0200)
Subject: Merge branch 'master' into divVerent/newboxparticles
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4d4c1d09055cb64eb5835305ea22d4a44bccbd2f;p=xonotic%2Fdarkplaces.git

Merge branch 'master' into divVerent/newboxparticles
---

4d4c1d09055cb64eb5835305ea22d4a44bccbd2f