Merge branch 'v2.6.x'
authorMichael Wallner <mike@php.net>
Wed, 5 Oct 2016 06:23:19 +0000 (08:23 +0200)
committerMichael Wallner <mike@php.net>
Wed, 5 Oct 2016 06:23:19 +0000 (08:23 +0200)
commit650b04d44f7ab3a5325865d9ffa10a5245ac7eca
tree0732a5780745d1e7d07229e8473342780ac92ceb
parent9dd0b2cfed592d833ab46eca976d50e0c5696d77
parent8fe1ea10f4f65d9806fefa374a9f41a792ad9c81
Merge branch 'v2.6.x'