Merge branch '2016.11' into 2016.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 15 Dec 2016 11:00:30 +0000 (12:00 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 15 Dec 2016 11:00:30 +0000 (12:00 +0100)
commit617e2b4fe58fcff3fac81d9866b158cb9694f4a4
treecd538a7a9ff584cd7d3aa8f0d3d84ff7fa28e5c9
parentcbd4dcba13db09ae77504b6aae5993d561d2a780
parent672b9006526931cbd88d9df46344acaab961a079
Merge branch '2016.11' into 2016.11-develop