Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 4 Aug 2016 08:34:37 +0000 (10:34 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 4 Aug 2016 08:34:37 +0000 (10:34 +0200)
commit6fafe8a41c3a22963711e9a765c8778bbf923f23
tree4d0ea2b9dcfa03ccd44f2989667c638d74388694
parent7048b92c6500cd832889f80682c62970f3be5f0e
parent9632aff4e767b4d9559106e562f291bf0509dfa4
Merge branch '2015.11' into 2015.11-develop