From: Rudolf Polzer <divverent@alientrap.org>
Date: Fri, 10 Dec 2010 23:43:26 +0000 (+0100)
Subject: Merge commit '7b4c329'
X-Git-Tag: xonotic-v0.1.0preview~61
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0a5f730751cf4a7f6ce555ef920fe9fdcd8e59ac;p=xonotic%2Fxonotic-data.pk3dir.git

Merge commit '7b4c329'
---

0a5f730751cf4a7f6ce555ef920fe9fdcd8e59ac