Merge branch '2016.11' into 2016.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 1 Dec 2016 17:05:50 +0000 (18:05 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 1 Dec 2016 17:05:50 +0000 (18:05 +0100)
commitfbf136a2a5fbbd1446e0e6f3b2c363675942e9d0
tree1334a84b877722f59adad0b3bebab0871a1bbb7f
parent10865a30e5f8c4457036a3fb682915e9edc73b74
parentbea104a344da444f8059e892ec3e80fc23493aa2
Merge branch '2016.11' into 2016.11-develop