From: FruitieX <fruitiex@gmail.com>
Date: Wed, 24 Nov 2010 17:39:14 +0000 (+0200)
Subject: Merge remote branch 'origin/master' into fruitiex/balance
X-Git-Tag: xonotic-v0.1.0preview~111
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ad06e104abb24d7dfb34a86442dfd1ed47f33810;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/master' into fruitiex/balance
---

ad06e104abb24d7dfb34a86442dfd1ed47f33810