From: Samual <samual@xonotic.org>
Date: Tue, 3 May 2011 20:56:41 +0000 (-0400)
Subject: Merge remote branch 'origin/master' into samual/verbose_warnings
X-Git-Tag: xonotic-v0.5.0~263^2~9^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=54597f9a6f2afe6fc2834a113da16262f8bad285;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/master' into samual/verbose_warnings
---

54597f9a6f2afe6fc2834a113da16262f8bad285