Merge branch '2015.11-develop' into 2016.11
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 22 Mar 2017 11:29:44 +0000 (12:29 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 22 Mar 2017 11:29:44 +0000 (12:29 +0100)
commit3a95e75104ef85ab1253725d4adfcfac9c0a5fb4
treed508ad110ff171c18b3a1bde12e17db99271c5a4
parent514172accab718ea8f5f10c5e57d235f83739a90
parent2fb299056403250fc73cbe3ea2d98298f90cabd5
Merge branch '2015.11-develop' into 2016.11