From: Rudolf Polzer <divVerent@xonotic.org>
Date: Fri, 1 Jul 2011 09:30:39 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.xonotic.org/netradiant-xonoticpack
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1172bedf8578207d2cbc15942cf804231126ec9b;p=xonotic%2Fnetradiant-xonoticpack.git

Merge branch 'master' of ssh://git.xonotic.org/netradiant-xonoticpack

Conflicts:
	games/xonotic.game
---

1172bedf8578207d2cbc15942cf804231126ec9b