Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 8 Jun 2016 14:54:22 +0000 (16:54 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 8 Jun 2016 14:54:22 +0000 (16:54 +0200)
commit65e75417d9db8f6e32522efd2824c62677213464
tree4a472dc7c8ec3a5c37816a7e522c16bee7c87a68
parenteef6cbb7e819989589e70dda41dc46fbdf3d6807
parent2c143dc72f044de40654272d9989683e5baf2a17
Merge branch '2015.11' into 2015.11-develop