]> WPIA git - cassiopeia.git/commitdiff
Merge remote-tracking branch 'origin/libs/detectcoll/local'
authorFelix Dörre <felix@dogcraft.de>
Sat, 7 Mar 2015 08:40:18 +0000 (09:40 +0100)
committerFelix Dörre <felix@dogcraft.de>
Sat, 7 Mar 2015 08:40:18 +0000 (09:40 +0100)

Trivial merge