From: Rudolf Polzer <divverent@xonotic.org>
Date: Tue, 15 May 2012 09:44:57 +0000 (+0200)
Subject: Merge commit '203343b01a7ad87cb3d136689c9936ff5bc23c01' into divVerent/cutAtDash
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c139ee77fbdb4a4a4f5fec61baf9dabb94d9e074;p=xonotic%2Fnetradiant.git

Merge commit '203343b01a7ad87cb3d136689c9936ff5bc23c01' into divVerent/cutAtDash
---

c139ee77fbdb4a4a4f5fec61baf9dabb94d9e074