Merge branch '2015.11-develop' into 2016.11
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 17 Nov 2016 17:10:01 +0000 (18:10 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 17 Nov 2016 17:10:01 +0000 (18:10 +0100)
commit2e52038412e2004425defa380a6e55332f60fd89
tree3532fb8d9f631d82a87b411a8ab41f00cb313ff6
parent9b69904791893dc4d52d5e4fc63b41ae74b0c5d2
parentd63f5e31a56b77d54fdf8b11dc332206735789d2
Merge branch '2015.11-develop' into 2016.11