]> WPIA git - cassiopeia.git/commitdiff
Merge branch 'libs/detectcoll/upstream' into libs/detectcoll/local
authorBenny Baumann <BenBE@geshi.org>
Sun, 9 Nov 2014 15:04:16 +0000 (16:04 +0100)
committerBenny Baumann <BenBE@geshi.org>
Sun, 9 Nov 2014 15:04:16 +0000 (16:04 +0100)

Trivial merge