Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 22 Mar 2017 11:28:14 +0000 (12:28 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 22 Mar 2017 11:28:14 +0000 (12:28 +0100)
commit2fb299056403250fc73cbe3ea2d98298f90cabd5
treef1f90cf5624fa7c1a448d980df90947b81fd0913
parent39afc864d846e78c1a80d22fbc9a6cd972ce398c
parent0acdd99f5c4d3fad063977db6203b844073222e8
Merge branch '2015.11' into 2015.11-develop