From: Rudolf Polzer <divverent@alientrap.org>
Date: Fri, 13 Jan 2012 21:49:15 +0000 (+0100)
Subject: Merge branch 'divVerent/timed-superweapons'
X-Git-Tag: xonotic-v0.6.0~177^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5eb33d999861a22adacb08d808421351b3291163;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'divVerent/timed-superweapons'
---

5eb33d999861a22adacb08d808421351b3291163