From: terencehill <piuntn@gmail.com>
Date: Tue, 24 May 2011 14:12:36 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/centerprint_stuff
X-Git-Tag: xonotic-v0.5.0~220
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9a2efec7718c9dd4805a8982f475f86f05509979;p=xonotic%2Fxonotic-data.pk3dir.git

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

9a2efec7718c9dd4805a8982f475f86f05509979