Merge branch '2016.11' into 2016.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 10 Apr 2017 13:02:34 +0000 (15:02 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 10 Apr 2017 13:02:34 +0000 (15:02 +0200)
commit230e3a690611db8ba6228c6c03b962fb15c6b60a
tree0d3087fe308a290fe7e34cca12ac9ac7dcdcf8ff
parentad4984ba4827378b44b7cbc8dd8d9dc8f8d74186
parent4a85791ae88c3d9e8b5167569d382ef1f67fdab0
Merge branch '2016.11' into 2016.11-develop