Merge branch '2015.11-develop' into 2016.11
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 16 Nov 2016 14:43:19 +0000 (15:43 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 16 Nov 2016 14:43:19 +0000 (15:43 +0100)
commit68568e9164dc755ec8aeeb971afd4fbbc8d679c7
tree600dc4b475bca0a1361cf8c4e9c58012b9d4a9da
parent4ed245f5b37d66447bd8e40424f7002bacbb24c7
parent7852c2f0cbb616483deb31fa381b53e1bd9b3207
Merge branch '2015.11-develop' into 2016.11