Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 25 Jan 2016 08:09:02 +0000 (09:09 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 25 Jan 2016 08:09:02 +0000 (09:09 +0100)
commitdf727f5764b0977da32b5729ac675b2d2081727c
treeb66f826fc762100f64ec66c7d37f9913ef6ec776
parentd4ca71ebc7a6e4a3950a0ea215626a5983b28979
parent3c86e0db666f6ff36ed268c155c2058c39c70ec5
Merge branch '2015.11' into 2015.11-develop