From: Rudolf Polzer <rpolzer@nb-04.(none)>
Date: Mon, 29 Mar 2010 06:41:31 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.xonotic.org/xonotic
X-Git-Tag: xonotic-v0.1.0preview~529
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=fe9e135a69b6daa403f88421e9e13cfbd5ee4ff5

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

fe9e135a69b6daa403f88421e9e13cfbd5ee4ff5