Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 2 Feb 2017 08:11:50 +0000 (09:11 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 2 Feb 2017 08:11:50 +0000 (09:11 +0100)
commitb7311e26c1a2f7d3b3cc09ad63eb9a9b1e489aa9
tree64afc2c2a94246f07fd63e59315d81711450087a
parentc2ef2873d1c936b24a4d1ab419a3cd72ad78ed7f
parent8b1a2767a7894ab0f436fdeb091b1dec06012fea
Merge branch '2015.11' into 2015.11-develop