From: Rudolf Polzer Date: Wed, 29 May 2013 04:10:58 +0000 (+0200) Subject: Merge branch 'master' of http://de.git.xonotic.org/xonotic/xonotic X-Git-Tag: xonotic-v0.7.0~5 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=52b1105997b7bd6a4274eb517593b9ca358fbeee;p=xonotic%2Fxonotic.git Merge branch 'master' of http://de.git.xonotic.org/xonotic/xonotic --- 52b1105997b7bd6a4274eb517593b9ca358fbeee