From: Rudolf Polzer <divVerent@xonotic.org>
Date: Fri, 26 Nov 2010 08:08:23 +0000 (+0100)
Subject: Merge remote branch 'origin/fruitiex/effectinfo_nerf'
X-Git-Tag: xonotic-v0.1.0preview~101^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8874199c028a79c4877fb406e3d27aa7870a8edc;p=xonotic%2Fxonotic-data.pk3dir.git

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

8874199c028a79c4877fb406e3d27aa7870a8edc