Merge branch '2015.11-develop' into 2016.11
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 1 Nov 2016 07:54:44 +0000 (08:54 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 1 Nov 2016 07:54:44 +0000 (08:54 +0100)
commitbf90769e639d2814a9c6c7ab403b055040db0067
tree94e4e88213600103fb0af4822145dfa0a6bd9980
parenta841ad19ded080958e569acacd6ac77ef29f8d46
parent95c320b382ed7b6852917d2ef147c034ddb3b139
Merge branch '2015.11-develop' into 2016.11