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

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

e464e2071661db5f091ac324719d668ba581aba9