Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 20 Jun 2016 11:47:10 +0000 (13:47 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 20 Jun 2016 11:47:10 +0000 (13:47 +0200)
commit097a572cfe4f2d74360a2651a7b3bc1cf58ff0f8
tree36dc7230718566c29e7236bc7f3b5c1000d986b9
parenteab3c7d5a81660cfcef7b29a20d08ff97122d4ac
parent1a2551b1ab1fe655a11275000dffbbc7769a50da
Merge branch '2015.11' into 2015.11-develop