From: Samual Lenks <samual@xonotic.org>
Date: Wed, 8 May 2013 00:37:05 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/terencehill/clear_button'
X-Git-Tag: xonotic-v0.7.0~55^2~13
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=35e620eefaa42e08f2f61d20b39132e39e58d476;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/terencehill/clear_button'
---

35e620eefaa42e08f2f61d20b39132e39e58d476