From: Rudolf Polzer <divverent@alientrap.org>
Date: Sat, 2 Oct 2010 11:46:45 +0000 (+0200)
Subject: Merge remote branch 'origin/fruitiex/effect_e8circle'
X-Git-Tag: xonotic-v0.1.0preview~129
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2cde167;p=xonotic%2Fxonotic-maps.pk3dir.git

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

2cde167b7bc7d46d8196ab850d39a024f78d0440