Merge branch '2015.11-develop' into 2016.11
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 19 Jan 2017 09:46:16 +0000 (10:46 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 19 Jan 2017 09:46:16 +0000 (10:46 +0100)
commit944ae04fc107814bf0cf445b8a63e848030cff72
tree440a947b148882d3f4d83b69f16fdf57abf36b1f
parent9cd681780ffb3f9c3c7d336bb746d19419f30413
parentfa222a966755fc7b06eac5ec6bc4542eb9e28c8b
Merge branch '2015.11-develop' into 2016.11