From: Rudolf Polzer Date: Tue, 13 Sep 2011 14:25:28 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/terencehill/align_fix' X-Git-Tag: xonotic-v0.6.0~40^2~141^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=13392e72281d2db279fa41ca56a00100609f5c23;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote-tracking branch 'origin/terencehill/align_fix' --- 13392e72281d2db279fa41ca56a00100609f5c23