From: TimePath <andrew.hardaker1995@gmail.com>
Date: Thu, 14 Apr 2016 02:00:43 +0000 (+1000)
Subject: Merge remote-tracking branch 'illwieckz/outoftree'
X-Git-Tag: xonotic-v0.8.2~14
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a68115c805c158e21a4b6574026a91e0ae58bfac;p=xonotic%2Fnetradiant.git

Merge remote-tracking branch 'illwieckz/outoftree'
---

a68115c805c158e21a4b6574026a91e0ae58bfac