Merge branch '2017.11' into 2017.11-develop
authorjenkins <tine20-jenkins@metaways.de>
Mon, 7 Aug 2017 17:12:21 +0000 (19:12 +0200)
committerjenkins <tine20-jenkins@metaways.de>
Mon, 7 Aug 2017 17:12:21 +0000 (19:12 +0200)
commit49308007ae154c1d7187cdcf686fa57286fbd726
tree56df782063adcbdd715f3ce726b45cf2bdac23da
parent371b7e3d8079361505464a49c80242237f95e930
parent8b85dead69191ead1ec08b6747925b4592d704eb
Merge branch '2017.11' into 2017.11-develop