From: terencehill <piuntn@gmail.com>
Date: Fri, 30 Mar 2018 23:00:25 +0000 (+0200)
Subject: Merge branch 'terencehill/powerup_randomness_2'
X-Git-Tag: xonotic-v0.8.5~2210
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=fcb38ff037a549fe09592b165bfe9188c48a5063;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/powerup_randomness_2'
---

fcb38ff037a549fe09592b165bfe9188c48a5063