From: Benny Baumann <BenBE@geshi.org>
Date: Sun, 9 Nov 2014 15:04:16 +0000 (+0100)
Subject: Merge branch 'libs/detectcoll/upstream' into libs/detectcoll/local
X-Git-Url: https://code.wpia.club/?p=cassiopeia.git;a=commitdiff_plain;h=a2e6990fd7d54433c2803703b8044762f10b9a3d

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

a2e6990fd7d54433c2803703b8044762f10b9a3d