]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.0' into PHP-7.1
authorJoe Watkins <krakjoe@php.net>
Mon, 9 Jan 2017 05:25:17 +0000 (05:25 +0000)
committerJoe Watkins <krakjoe@php.net>
Mon, 9 Jan 2017 05:25:17 +0000 (05:25 +0000)
commit0738a78c59f4a3fabfb38b63c80a6c863736ba34
tree630be11092704fe138561ef2e2e686a5904c2de5
parent6166a0d68dd50a95c1fee77c585f18c98d04b6d9
parent8c653c163a7c6f8fa3c1394bd1d482480c226177
Merge branch 'PHP-7.0' into PHP-7.1

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