From: Rudolf Polzer <divverent@alientrap.org>
Date: Fri, 2 Jul 2010 08:39:12 +0000 (+0200)
Subject: Merge remote branch 'refs/remotes/origin/diabolik/rifleelectrofix'
X-Git-Tag: xonotic-v0.1.0preview~29
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d15b126bf51d20b47e34893a0049bf810e340c50;p=xonotic%2Fmediasource.git

Merge remote branch 'refs/remotes/origin/diabolik/rifleelectrofix'
---

d15b126bf51d20b47e34893a0049bf810e340c50