Merge branch '2016.11-develop-setup' into 2016.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 21 Mar 2017 14:50:50 +0000 (15:50 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 21 Mar 2017 14:50:50 +0000 (15:50 +0100)
commit86dc6e8da74d62483e3858043f9a0ef408c10a8c
tree5739a004ea31cdcdbf30a89a30f212635ed3dd4d
parent592c70bb0f3aacc13ba2ffeaf2b4bad455f3344b
parentcba42573746d95f0c8e6c6985080ac7eb1fb47a4
Merge branch '2016.11-develop-setup' into 2016.11-develop