From: Rudolf Polzer <divVerent@xonotic.org>
Date: Mon, 29 Aug 2011 09:07:28 +0000 (+0200)
Subject: Merge commit 'b2baadb34fab4fa42d1529f083eb72b4df105049'
X-Git-Tag: xonotic-v0.5.0~29
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7bec16e96b757f302d362ac4ab0709e5905ee546;p=xonotic%2Fxonotic-data.pk3dir.git

Merge commit 'b2baadb34fab4fa42d1529f083eb72b4df105049'
---

7bec16e96b757f302d362ac4ab0709e5905ee546