Merge branch '2015.11-develop' into 2016.03
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 9 May 2016 12:02:40 +0000 (14:02 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 9 May 2016 12:02:40 +0000 (14:02 +0200)
commit73f1cde1698d2e1d609d1f4cd321d63bfb5f68de
tree9fb49ae075e4826ea51d1a61180f12ec73ee1328
parent279eea0fc86de0b24636435370ec4e26bb40f096
parentaa034abc9f877e2395a99cb018f29eec565ac488
Merge branch '2015.11-develop' into 2016.03