Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 28 Apr 2016 14:16:44 +0000 (16:16 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 28 Apr 2016 14:16:44 +0000 (16:16 +0200)
commitfe344fd6e4d6d77d64dae01cebd455812f964ea2
treed84f64de4c2c30143adfb8b899c50c69a7a21c0f
parent6e7c210d2f5116707351c1b6872caab0caf3f231
parentcfa3fe6682ce51eea963be00e99a82bb17653209
Merge branch '2015.11' into 2015.11-develop