From: Rudolf Polzer <divVerent@xonotic.org>
Date: Thu, 18 Nov 2010 15:29:54 +0000 (+0100)
Subject: Merge branch 'master' into divVerent/pangofix-public
X-Git-Tag: xonotic-v0.5.0~144^2~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c4d9df0a2c16b5b2a8b4a67f0139dc78c245de6c;p=xonotic%2Fnetradiant.git

Merge branch 'master' into divVerent/pangofix-public
---

c4d9df0a2c16b5b2a8b4a67f0139dc78c245de6c