From: mand1nga <mand1nga@xonotic.org>
Date: Fri, 8 Apr 2011 21:49:36 +0000 (-0300)
Subject: Merge branch 'master' into diabolik/afterslime
X-Git-Tag: xonotic-v0.5.0~98^2~18^2^2~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0f16b651dffdcac5aa71450c77a2791ae160be04;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into diabolik/afterslime
---

0f16b651dffdcac5aa71450c77a2791ae160be04