From: Rudolf Polzer <divverent@xonotic.org>
Date: Thu, 27 Oct 2011 12:32:14 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/atheros/secret'
X-Git-Tag: xonotic-v0.6.0~72^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a733dd2cc67aaef9a9d9097bd1dc9b331aad72de;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote-tracking branch 'origin/atheros/secret'
---

a733dd2cc67aaef9a9d9097bd1dc9b331aad72de