Merge branch '2016.11-develop' into 2017.11
authorjenkins <tine20-jenkins@metaways.de>
Mon, 7 Aug 2017 11:06:38 +0000 (13:06 +0200)
committerjenkins <tine20-jenkins@metaways.de>
Mon, 7 Aug 2017 11:06:38 +0000 (13:06 +0200)
commit6a1bbd2ee7cb8325926629e4f3733b2a8e7857b0
treeb648716cbd79e1846abd51bc8ea3b8d0559867a7
parent2172deac1378c563ea8af1752e858d2ad88d2796
parente4c26f048887598bdfbd0493f67e719e862b6cc5
Merge branch '2016.11-develop' into 2017.11