From: Felix Dörre <felix@dogcraft.de>
Date: Sat, 7 Mar 2015 08:40:18 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/libs/detectcoll/local'
X-Git-Url: http://www.controwiki.de/?a=commitdiff_plain;h=f69f31caeda734d6d9c8ab00e693671ac7512bea;p=cassiopeia.git

Merge remote-tracking branch 'origin/libs/detectcoll/local'
---

f69f31caeda734d6d9c8ab00e693671ac7512bea