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

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

3ecc3113aeea149ab79b3701dd87e52e5689458a