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

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

8bc246a01343d9c9dd3a8b678681710cf04a2953