Merge branch '2015.11-develop' into 2016.11
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 3 Apr 2017 19:42:23 +0000 (21:42 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 3 Apr 2017 19:42:23 +0000 (21:42 +0200)
commit7f05c2f9fa1ca1ca3966cb5edb84ab416c06a906
treed8a101a3af42fc568a8a9d2e2b15f6f6335c605f
parent37e3ec0b8e8ba920f3887a2bfada320df25c37a8
parenta55a781ddd42a92b2d183d3748c9117eeebd0f4d
Merge branch '2015.11-develop' into 2016.11

Change-Id: I3335561b3da64b13cb8ca92bd1c12d5ca66e7a91