Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 23 Mar 2016 11:19:04 +0000 (12:19 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 23 Mar 2016 11:19:04 +0000 (12:19 +0100)
commitd6cc3bb424f9ffedc762a0797998120e50dc1dff
tree83e93aa3e4283567c97ec6eca33cfcff5750cf7f
parent78bc47ec4705fa97038fced9264c9b0dd4337ef8
parent2d469fca0cc5170203b4e1e0c90399eed7353c6d
Merge branch '2015.11' into 2015.11-develop