From: Rudolf Polzer <divverent@alientrap.org>
Date: Tue, 19 Oct 2010 06:37:34 +0000 (+0200)
Subject: Merge remote branch 'refs/remotes/origin/fruitiex/tenshihanpack'
X-Git-Tag: xonotic-v0.1.0preview~100
X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=fccc04071a38fe0c13f01e90f54c8cec56f64fd2;hp=19c616b169375ec83250429113d2ea2290de7bda;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote branch 'refs/remotes/origin/fruitiex/tenshihanpack'
---