Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 9 Feb 2016 13:16:11 +0000 (14:16 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 9 Feb 2016 13:16:11 +0000 (14:16 +0100)
commitb2b4b4bbfb6e8cfd05e8e03a302ae011a96011a0
tree98fa61f05a9da1a69a26362aed689d91aa5512a0
parentf2d7c40bad303f06f745fb16120a882ebf8cc010
parent1efa4e699461a425626461407333ac8fba855adf
Merge branch '2015.11' into 2015.11-develop