Merge branch '2014.11' into 2015.11
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 8 Jun 2016 14:54:03 +0000 (16:54 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 8 Jun 2016 14:54:03 +0000 (16:54 +0200)
commit2c143dc72f044de40654272d9989683e5baf2a17
tree2353f03ed4836b8193a04938f84d839f9e859979
parent2b44aeb917b9e3ee8fb07b79512429be6c4cebd4
parent1c75a33ba27090ec7ffe8c892634430a1e75ac52
Merge branch '2014.11' into 2015.11