From: BuddyFriendGuy <bfggeneral@gmail.com>
Date: Thu, 7 Jul 2016 21:26:06 +0000 (-0400)
Subject: Merge branch 'master' of ssh://gitlab.com/xonotic/xonotic.wiki
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d4bafd0da3619405aadfd9dbb451190ba04cfce5;p=xonotic%2Fxonotic.wiki.git

Merge branch 'master' of ssh://gitlab.com/xonotic/xonotic.wiki
---

d4bafd0da3619405aadfd9dbb451190ba04cfce5