Merge branch '2016.11-develop' into 2017.11
authorjenkins <tine20-jenkins@metaways.de>
Mon, 7 Aug 2017 14:34:40 +0000 (16:34 +0200)
committerjenkins <tine20-jenkins@metaways.de>
Mon, 7 Aug 2017 14:34:40 +0000 (16:34 +0200)
commit7f5c26388691b85cfad5450199fbb33e14ee6481
treecd40287594e0980de4005358644e81749808664c
parent04b34791b8aa78231a8620a2d83d6f25f9c9dbbc
parente7a191c5e5b046e69812185b7319150da037d0ad
Merge branch '2016.11-develop' into 2017.11