Merge branch '2015.11-php7' into 2015.11
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 6 Apr 2016 08:35:31 +0000 (10:35 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 6 Apr 2016 08:35:31 +0000 (10:35 +0200)
commitdbf3bf82a2939e4943f44e84a902a75bfc4ad85d
tree7662c0b0ddbbef48ac3351b94a9c2435b83f0d2b
parente4f1d356e2849d81a9b479d416cca65b4eed5029
parent3238ff427cd2f356095a8b42b98fd47c32fdf773
Merge branch '2015.11-php7' into 2015.11