From: Rudolf Polzer <divverent@alientrap.org>
Date: Tue, 20 Jul 2010 17:54:14 +0000 (+0200)
Subject: Merge remote branch 'origin/fruitiex/xpmphysics'
X-Git-Tag: xonotic-v0.1.0preview~441
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=d410f2dac748fc86975352121080f93f2200709e

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

d410f2dac748fc86975352121080f93f2200709e