Merge branch 'v2.6.x'
authorMichael Wallner <mike@php.net>
Mon, 12 Sep 2016 06:54:16 +0000 (08:54 +0200)
committerMichael Wallner <mike@php.net>
Mon, 12 Sep 2016 06:54:16 +0000 (08:54 +0200)
commit0869caece2853a07711676bad8f032fa89ed82e9
treec640818907722c39c32a999fe225f00b6bb5e8cf
parentb3831bc5f19cf32880ea19341c3527f0e9553517
parent70cbf84439cb4b0fec252966ffd596ebb6bbfdbc
Merge branch 'v2.6.x'