From: Rudolf Polzer <divverent@alientrap.org>
Date: Sun, 26 Dec 2010 21:28:22 +0000 (+0100)
Subject: Merge remote branch 'origin/fruitiex/electrofix'
X-Git-Tag: xonotic-v0.5.0~330^2~14^2~12
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3665253d0364d6cca5a50f4ef5b45a814c8da6ec;p=xonotic%2Fxonotic-data.pk3dir.git

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

3665253d0364d6cca5a50f4ef5b45a814c8da6ec