Merge branch '2016.11' into 2016.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 11 Jan 2017 15:01:59 +0000 (16:01 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 11 Jan 2017 15:01:59 +0000 (16:01 +0100)
commit9bacd6b50cf87a3bc75d0133530e7e6966fa4891
tree22a75c7d7edc92629138080146ae756a8f53bc01
parent2cc53cd69c0907e5b779e0894b2849bac59c7d6a
parent0338bbca7ac67fe312b59bd8b4db544e41ff1ff2
Merge branch '2016.11' into 2016.11-develop

Change-Id: I080cc2638982523810c5d17d94cf9f8c8b75f8f8
tine20/composer.lock