From: Mattia Basaglia <mattia.basaglia@gmail.com>
Date: Wed, 22 Jul 2015 08:22:56 +0000 (+0200)
Subject: Merge branch 'master' of ssh://gitlab.com/xonotic/netradiant into Melanosuchus/modernize
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fheads%2FMelanosuchus%2Fmodernize;p=xonotic%2Fnetradiant.git

Merge branch 'master' of ssh://gitlab.com/xonotic/netradiant into Melanosuchus/modernize
---

c3d2ea27c93912ee9c73fbcb865bbdd05c7e835d