Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 19 Jan 2017 09:46:07 +0000 (10:46 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 19 Jan 2017 09:46:07 +0000 (10:46 +0100)
commitfa222a966755fc7b06eac5ec6bc4542eb9e28c8b
tree80f725dcbce5c1ec4b45dc2e0ba124cbea2bda75
parente56f61c553c771ff86a6bdba3b5d47c0bf2efcae
parente105ba57d5fe3eab424fdb141ca070ffa8a7f14a
Merge branch '2015.11' into 2015.11-develop