]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.1'
authorJoe Watkins <krakjoe@php.net>
Mon, 9 Jan 2017 05:25:31 +0000 (05:25 +0000)
committerJoe Watkins <krakjoe@php.net>
Mon, 9 Jan 2017 05:25:31 +0000 (05:25 +0000)
commit392dca4c8fe5bbec9faf44b60e1c7df67404bb90
tree033046e6fa550b92b4695e5d35286f946b88b7a2
parent7b98ecfa3b9924c28a8e49af4aa5912b9cef7210
parent0738a78c59f4a3fabfb38b63c80a6c863736ba34
Merge branch 'PHP-7.1'

* PHP-7.1:
  update ip2long_varation2 test to skip for AIX, see bug #72973