Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 28 Apr 2016 09:47:21 +0000 (11:47 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 28 Apr 2016 09:47:21 +0000 (11:47 +0200)
commit6e7c210d2f5116707351c1b6872caab0caf3f231
tree6c7b8fbc791897e10cdc20a504d477185a682dda
parentf7645f68d455fb37b07254a8078f3ec81664e838
parent9d966a757612a93fc0ca27a1a3149d1e5b9cf604
Merge branch '2015.11' into 2015.11-develop