Merge branch '2015.11-develop' into 2016.11
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 27 Oct 2016 13:50:55 +0000 (15:50 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 27 Oct 2016 13:50:55 +0000 (15:50 +0200)
commit84178806af7b8dca7d6a5b335f02123ed909a31e
tree923ab50b86a1166e359a6cf0addd0cf26a81aa27
parentcf1d0f7d8a363c1e72326eb836baad5e3986e462
parentd5eb473a2090517c0f4fee28c04fe277d16d6166
Merge branch '2015.11-develop' into 2016.11