From: FruitieX <fruitiex@gmail.com>
Date: Wed, 29 Dec 2010 03:34:25 +0000 (+0200)
Subject: Merge remote branch 'origin/master' into diabolik/strength
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f432c5be1afaacaf2f3a0c9f2a7384801a353f5e;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote branch 'origin/master' into diabolik/strength
---

f432c5be1afaacaf2f3a0c9f2a7384801a353f5e