Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 4 Aug 2016 08:48:27 +0000 (10:48 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 4 Aug 2016 08:48:27 +0000 (10:48 +0200)
commitc32a528f2b6952aedce58cdc8c877711afb52c6a
treed3b6ca26712b3072a02cba435abf390cc99ad303
parent6fafe8a41c3a22963711e9a765c8778bbf923f23
parentc1a3459d67dead61423fbd18490f594701b309ac
Merge branch '2015.11' into 2015.11-develop