From: terencehill <piuntn@gmail.com>
Date: Sat, 1 Jul 2017 12:10:08 +0000 (+0200)
Subject: Merge branch 'terencehill/eraseable_functions'
X-Git-Tag: xonotic-v0.8.5~2668
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0bd99205bd154e058edc6b82995d24e3375f5f97;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/eraseable_functions'
---

0bd99205bd154e058edc6b82995d24e3375f5f97