Merge branch '2015.11-develop' into 2016.03
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 30 Mar 2016 10:02:15 +0000 (12:02 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 30 Mar 2016 10:02:15 +0000 (12:02 +0200)
commit9f0090d2cd90b186b99c058c66523afdcaa14b57
tree3683d0941cf910543769be92d7d637a01e28b91d
parentcb87bd840ce8a90a769ed67e40591d780a195a6a
parent9eb9c71bc79c86d6ba3d3a63c0c686db3b7352f0
Merge branch '2015.11-develop' into 2016.03