From: mand1nga <mand1nga@xonotic.org>
Date: Sun, 1 May 2011 23:16:44 +0000 (-0300)
Subject: Merge remote-tracking branch 'origin/fruitiex/fix_slap'
X-Git-Tag: xonotic-v0.5.0~264^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=69fb3ad9e95135d9e501d0354b2d934d91fb70d8;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/fruitiex/fix_slap'
---

69fb3ad9e95135d9e501d0354b2d934d91fb70d8