From: Rudolf Polzer <divverent@alientrap.org>
Date: Mon, 15 Nov 2010 20:49:41 +0000 (+0100)
Subject: Merge remote branch 'origin/fruitiex/dance'
X-Git-Tag: xonotic-v0.1.0preview~31
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c3e7aeeced480988ad5f99cb391c40ac55b4991b;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote branch 'origin/fruitiex/dance'
---

c3e7aeeced480988ad5f99cb391c40ac55b4991b