Merge branch '2016.11-php7' into 2016.11
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 17 Aug 2016 13:35:06 +0000 (15:35 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 17 Aug 2016 13:35:06 +0000 (15:35 +0200)
commit83d4b6844315f7e5b3efe295d38f5bee4b9efc6d
tree8e13ba55bca5f17604b2078545e92dd495408c12
parenta3e256a3cbf78010343ed2afd1c216b8b46eebfb
parent14bac903ded51292b1e8bfa6fa7b351ea8727e91
Merge branch '2016.11-php7' into 2016.11