Merge branch '2015.11-develop' into 2016.11
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 14 Nov 2016 18:04:47 +0000 (19:04 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 14 Nov 2016 18:04:47 +0000 (19:04 +0100)
commit7d0e7eaa2e9da3504e3e88942d93e68ad45e0d4f
tree06fcfa9e4f66907a1704e64965aee567159abf72
parentb844ec652118c9c1c3268750a40918a7ec60e347
parent8006e60e5ec80e560d022c7528892692d5728cd2
Merge branch '2015.11-develop' into 2016.11