From: terencehill <piuntn@gmail.com>
Date: Sat, 16 Jul 2011 20:37:21 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/centerprint_stuff
X-Git-Tag: xonotic-v0.5.0~52^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=44effb3a66f8b44d05106ff361ef5fc126fef03b;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/centerprint_stuff
---

44effb3a66f8b44d05106ff361ef5fc126fef03b