Merge branch '2016.11-develop-setup' into 2016.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 30 Jun 2017 06:53:12 +0000 (08:53 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 30 Jun 2017 06:53:12 +0000 (08:53 +0200)
commit106cf26604a6b5baf6c027294051eb59e8e5f25d
tree77f4a8e27bfdc9f580ed8ed321586f85f9b1852a
parent31531e9563e9cf01560028a317e2c00f3eb09f88
parent444f1d1ef4ddc1eb06200be43ebfc5b952b39d7c
Merge branch '2016.11-develop-setup' into 2016.11-develop