From: Rudolf Polzer <divverent@alientrap.org>
Date: Thu, 29 Jul 2010 17:13:12 +0000 (+0200)
Subject: Merge commit '3f5af11a8794a82f13d066452580dd8d0cc756bc'
X-Git-Tag: xonotic-v0.1.0preview~383^2~4
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=6206caf97a69286b25226a8287583e4a4598d19a

Merge commit '3f5af11a8794a82f13d066452580dd8d0cc756bc'
---

6206caf97a69286b25226a8287583e4a4598d19a