Merge branch '2017.11' into 2017.11-develop
authorjenkins <tine20-jenkins@metaways.de>
Fri, 11 Aug 2017 09:34:18 +0000 (11:34 +0200)
committerjenkins <tine20-jenkins@metaways.de>
Fri, 11 Aug 2017 09:34:18 +0000 (11:34 +0200)
commited64ed076a361c2c4f76c432abb5d2434cffea8e
treedc576d44c5d6efc3e1c048439f2078bcaab3226c
parent4fe3716e722528d051019b66e293e102e186476f
parent254cde99d0460548d0227fc8815550ec7147bb8a
Merge branch '2017.11' into 2017.11-develop