From: Mirio <opivy@hotmail.de>
Date: Thu, 27 Aug 2015 16:06:44 +0000 (+0200)
Subject: Merge branch 'Mirio/universaltrigger'
X-Git-Tag: xonotic-v0.8.2~186
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4c851763bf11da63cd01698d6ace3f81ffd5a28c;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'Mirio/universaltrigger'
---

4c851763bf11da63cd01698d6ace3f81ffd5a28c