Merge branch '2016.11' into 2016.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 5 Jan 2017 13:50:45 +0000 (14:50 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 5 Jan 2017 13:50:45 +0000 (14:50 +0100)
commitae837d3981e3faeb23d4e4011dccb0281afcf34d
treefa8333ffeb72151c6c4ef60107386e4f63020be1
parentb75fbc58e12204fc95a02e1f99c579b1c4e3ce96
parentb87f8fd7be0ad84f15d2563ba21dbed77dfb85a4
Merge branch '2016.11' into 2016.11-develop

Change-Id: I1ded32a381931d749bf87c13d0dfa175305e3680
tine20/composer.lock