From: terencehill <piuntn@gmail.com>
Date: Sun, 12 Jun 2011 23:53:36 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/centerprint_stuff
X-Git-Tag: xonotic-v0.5.0~211
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=900269c6bbf7fabfb9ab8976d8eace8ea7027271

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

900269c6bbf7fabfb9ab8976d8eace8ea7027271