Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 21 Apr 2016 09:09:00 +0000 (11:09 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 21 Apr 2016 09:09:00 +0000 (11:09 +0200)
commit4dee4ca39e39c2321adf11939018555167c9892d
treea577418ff31c7f85a8d68c63cd4258dbeda981d7
parent902c8b302c8c4da895e2b0a6e9f51b1bcbc2afa3
parent0f79ad45a91ae718808dbbc56febbc4d04f9d6a5
Merge branch '2015.11' into 2015.11-develop