From: packer <packer@local>
Date: Sun, 21 Feb 2016 18:48:04 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into packer/vorix
X-Git-Tag: xonotic-v0.8.2~131^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6779fa5ae5c6e332ed82703b9f8d7525a81614c9;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote-tracking branch 'origin/master' into packer/vorix
---

6779fa5ae5c6e332ed82703b9f8d7525a81614c9