Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 8 Feb 2017 13:34:23 +0000 (14:34 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 8 Feb 2017 13:34:23 +0000 (14:34 +0100)
commitdb88ea7e7d3f2f47cb1a2a572972804f0bd1eab7
tree66d7b7bb4405be2b3dd049eadfcc076a1688034d
parentb7311e26c1a2f7d3b3cc09ad63eb9a9b1e489aa9
parentec40afe8ecf1d8e7f17e1614d5d51bc980a45c36
Merge branch '2015.11' into 2015.11-develop