From: terencehill <piuntn@gmail.com>
Date: Wed, 13 Jun 2012 11:41:57 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/clear_button
X-Git-Tag: xonotic-v0.7.0~55^2~13^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7cf65fc959abac34d7791793d8d10e091416df2f;p=xonotic%2Fxonotic-data.pk3dir.git

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

7cf65fc959abac34d7791793d8d10e091416df2f