From: Rudolf Polzer <divverent@alientrap.org>
Date: Sat, 14 May 2011 12:47:31 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/savagex/common'
X-Git-Tag: xonotic-v0.5.0~95^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=38b521858183cb7194a081e9d477a302b938bce5;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote-tracking branch 'origin/savagex/common'
---

38b521858183cb7194a081e9d477a302b938bce5