From: Rudolf Polzer <divverent@alientrap.org>
Date: Thu, 22 Apr 2010 18:35:56 +0000 (+0200)
Subject: Merge commit '54e0ccd220df'
X-Git-Tag: xonotic-v0.1.0preview~644
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=16793b41ca6dabdc4ce48f663f4ed3ed6de9ee85;p=xonotic%2Fxonotic-data.pk3dir.git

Merge commit '54e0ccd220df'
---

16793b41ca6dabdc4ce48f663f4ed3ed6de9ee85