From: Rudolf Polzer <divVerent@alientrap.org>
Date: Sat, 8 May 2010 12:57:34 +0000 (+0200)
Subject: Merge remote branch 'origin/mirceakitsune/gravity_trigger'
X-Git-Tag: xonotic-v0.1.0preview~640^2~11
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b334d049e62088e7544b2d1453b5a95a4245813c;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/mirceakitsune/gravity_trigger'
---

b334d049e62088e7544b2d1453b5a95a4245813c