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

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

08000124aa049edef5ee12968d402dd56be93f94