Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 6 Apr 2016 09:27:40 +0000 (11:27 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 6 Apr 2016 09:27:40 +0000 (11:27 +0200)
commit5e34ac65f710a555f262e61fec44f58cc287eb65
tree6c6a0ef6efaac7e42914174043e13bbaf9726e89
parent6688fcaeeb7ce31693f0bde86b4a06352a15ba69
parentdbf3bf82a2939e4943f44e84a902a75bfc4ad85d
Merge branch '2015.11' into 2015.11-develop