Merge branch '2017.11' into 2017.11-develop
authorjenkins <tine20-jenkins@metaways.de>
Wed, 9 Aug 2017 12:10:30 +0000 (14:10 +0200)
committerjenkins <tine20-jenkins@metaways.de>
Wed, 9 Aug 2017 12:10:30 +0000 (14:10 +0200)
commitcfcd38d1d0b09de6e394e9501e7b517cc2f2ff93
treed758d6a6b89d1e792088ce14a988bbd8b1741b54
parentbd038583b6754abb0ddabcc1df3a28067eeb4554
parent9688d5f2d83ae935caac4f9dfd9565dc0a8bc600
Merge branch '2017.11' into 2017.11-develop