From: Rudolf Polzer <divverent@alientrap.org>
Date: Fri, 6 Aug 2010 06:31:53 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.xonotic.org/xonotic
X-Git-Tag: xonotic-v0.1.0preview~327
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=9915810783acd33b98183515f5625aa21f2e3458

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

9915810783acd33b98183515f5625aa21f2e3458