From: Samual <samual@xonotic.org>
Date: Mon, 12 Sep 2011 07:27:41 +0000 (-0400)
Subject: Merge remote branch 'origin/divVerent/typofix'
X-Git-Tag: xonotic-v0.6.0~40^2~118^2~17
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8336dd123d142283c8e6199589d64c53fcde8388;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/divVerent/typofix'
---

8336dd123d142283c8e6199589d64c53fcde8388