From: Samual Lenks <samual@xonotic.org>
Date: Mon, 10 Jun 2013 01:11:09 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/samual/gameplay'
X-Git-Tag: xonotic-v0.8.0~389^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=72646dce0aa577090f682ed30c94509f9e3d8046;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/samual/gameplay'
---

72646dce0aa577090f682ed30c94509f9e3d8046