Merge branch '2017.11' into 2017.11-develop
authorjenkins <tine20-jenkins@metaways.de>
Thu, 3 Aug 2017 16:56:19 +0000 (18:56 +0200)
committerjenkins <tine20-jenkins@metaways.de>
Thu, 3 Aug 2017 16:56:19 +0000 (18:56 +0200)
commit16f68ad1a56f3a984479199c1d07a2d47f1fcdb5
tree140db1b3f4fa91bfa75e1dc6b550863ef04b518a
parent403a5fdfdc6665e0a5359d6ed2788317124b23e4
parentaccbb36a5783d3ebe39d937db4999924b0c5bb93
Merge branch '2017.11' into 2017.11-develop