Merge branch '2015.11-develop' into 2016.11
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 5 Jan 2017 13:49:15 +0000 (14:49 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 5 Jan 2017 13:49:15 +0000 (14:49 +0100)
commitb87f8fd7be0ad84f15d2563ba21dbed77dfb85a4
tree55bd0d644bf897319db2d89b12cd86105a7584bd
parentf6781a1456ae99998eba5fbefb752994b96a10f6
parent6f5d1303d97a777704d0b87cdf36df5a11e4c179
Merge branch '2015.11-develop' into 2016.11