Merge branch '2014.11-develop' into 2015.11
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 10 Dec 2015 09:35:47 +0000 (10:35 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 10 Dec 2015 09:35:47 +0000 (10:35 +0100)
commitf692555f54a0c339111e45eee16b1e6c040f28e1
tree72f2911f9e033292e0abc64f6da3bd39f9efb1b7
parent6d63e01771202e484035907890c33f702f902af0
parent6fc4eae22b6fd02d6ac80784ceda1a3255782224
Merge branch '2014.11-develop' into 2015.11