From: Samual Lenks <samual@xonotic.org>
Date: Mon, 10 Sep 2012 19:39:49 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/ablu/nexball'
X-Git-Tag: xonotic-v0.7.0~241
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ffaaa190a7d0ce5580be162747408693070894bf;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/ablu/nexball'
---

ffaaa190a7d0ce5580be162747408693070894bf