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

Merge remote branch 'origin/parasti/mortar-bounce'
---

d6bc3b20a5d8977eae46b6af38191e178aeaae8d