Merge branch '2015.11-develop'
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 10 Mar 2016 14:06:33 +0000 (15:06 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 10 Mar 2016 14:06:33 +0000 (15:06 +0100)
commita2e60a5b0279f4178badd775524eca70766bbcb7
tree10764254b4b241edaefe6aede782507c250e9ea4
parentc681941a43f10ff07e01eb184ef876a6a29d04ce
parentd899746f2690e61e8eace75e42223384e188795a
Merge branch '2015.11-develop'