Merge branch '2017.11' into 2017.11-develop
authorjenkins <tine20-jenkins@metaways.de>
Mon, 7 Aug 2017 11:09:05 +0000 (13:09 +0200)
committerjenkins <tine20-jenkins@metaways.de>
Mon, 7 Aug 2017 11:09:05 +0000 (13:09 +0200)
commitb9e458d8bd5192a00da0364ac3e558b05a634e18
treed63c160827d6f18011c111299e0a4bed2c62c4a8
parent2eba84bd4d9cbb6e087b70721fe4eac1cbf75bfb
parent6a1bbd2ee7cb8325926629e4f3733b2a8e7857b0
Merge branch '2017.11' into 2017.11-develop