From: Rudolf Polzer <divverent@xonotic.org>
Date: Fri, 7 Oct 2011 12:06:58 +0000 (+0200)
Subject: Merge branch 'divVerent/xact'
X-Git-Tag: xonotic-v0.6.0~67^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6b70522a4b2e76e6c5c714fb10e5070b65ebd30d;p=xonotic%2Fnetradiant.git

Merge branch 'divVerent/xact'
---

6b70522a4b2e76e6c5c714fb10e5070b65ebd30d