From: Rudolf Polzer <rpolzer@grawp.(none)>
Date: Sun, 28 Mar 2010 18:51:56 +0000 (+0200)
Subject: Merge commit 'origin/diabolik/iqmsupport'
X-Git-Tag: xonotic-v0.1.0preview~674
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f59a071b441a5467f71532fbace066ccae9137a4;p=xonotic%2Fxonotic-data.pk3dir.git

Merge commit 'origin/diabolik/iqmsupport'
---

f59a071b441a5467f71532fbace066ccae9137a4