From: Rudolf Polzer Date: Wed, 21 Jul 2010 10:01:23 +0000 (+0200) Subject: Merge branch 'origin/master' (early part) into fruitiex/runningmanctf X-Git-Tag: xonotic-v0.5.0~129^2~69^2~2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=227419bca5e80c4de92a8a7d06a3f8d473b8ac50;p=xonotic%2Fxonotic-maps.pk3dir.git Merge branch 'origin/master' (early part) into fruitiex/runningmanctf --- 227419bca5e80c4de92a8a7d06a3f8d473b8ac50