Merge branch '2014.11-develop' into 2015.07
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 26 Oct 2015 11:26:38 +0000 (12:26 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 26 Oct 2015 11:26:38 +0000 (12:26 +0100)
commit4058cf92dc363291ed8480c551b67e704d4414d3
treebdcb55446cf68433ccaa1a0f3fb2a7025e176d6d
parent2711f777678022fc1e39cea843453d8dc355e32f
parentc8b2e3efafd1c97d32d69c1255c77c9f971a62d2
Merge branch '2014.11-develop' into 2015.07