From: Rudolf Polzer <divverent@alientrap.org>
Date: Thu, 5 Aug 2010 17:31:04 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.xonotic.org/xonotic
X-Git-Tag: xonotic-v0.1.0preview~329
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=9909604a8d7fc034dd4cf2dca4548527e4bc1403

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

9909604a8d7fc034dd4cf2dca4548527e4bc1403