From: itsme <itsme.xonotic@ymail.com>
Date: Thu, 5 Jan 2012 22:16:34 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/diabolik/strength' into itsme/strength
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a6ee3525453054344e1b581f4c904dba8577547b;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote-tracking branch 'origin/diabolik/strength' into itsme/strength
---

a6ee3525453054344e1b581f4c904dba8577547b