From: Felix Dörre <felix@dogcraft.de>
Date: Sat, 29 Oct 2016 14:27:00 +0000 (+0200)
Subject: Merge branch 'master' into libs/detectcoll/local
X-Git-Url: https://code.wpia.club/?p=cassiopeia.git;a=commitdiff_plain;h=156855b7e12c3a0254590da514b0d0e8efe469f4;hp=ed858b3a84289bd8893b91e1044d4fd3b4799877

Merge branch 'master' into libs/detectcoll/local
---