From: Samual <samual@xonotic.org>
Date: Wed, 29 Feb 2012 19:42:42 +0000 (-0500)
Subject: Merge remote branch 'origin/terencehill/minstagib_outofammo'
X-Git-Tag: xonotic-v0.6.0~35
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5c261e6c8b328196282545db4b6d1b85df2a12d5;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/terencehill/minstagib_outofammo'
---

5c261e6c8b328196282545db4b6d1b85df2a12d5