From: terencehill Date: Fri, 19 Aug 2011 23:11:45 +0000 (+0200) Subject: Merge branch 'master' into terencehill/centerprint_stuff X-Git-Tag: xonotic-v0.5.0~52^2~2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e272bb5918f084daadf92e7f90f0cab46e4bda31;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into terencehill/centerprint_stuff --- e272bb5918f084daadf92e7f90f0cab46e4bda31