Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 16 Mar 2016 16:53:24 +0000 (17:53 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 16 Mar 2016 16:53:24 +0000 (17:53 +0100)
commit89259c809d6957720916aa0d6fb69aa8f87f28c4
treebbf181a0d92f5ed83e982580e757c8bf844c849d
parent9c952d0b858f1c12169cc6a0873c90844918df38
parent27eba077e1fc644272d4432c56db5cf1b1bbb024
Merge branch '2015.11' into 2015.11-develop