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

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

9aac6e6f635713cfaaad0d70700d71a8b0c7405e