From: Joe Watkins <krakjoe@php.net>
Date: Mon, 9 Jan 2017 05:25:17 +0000 (+0000)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.2RC1~111
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0738a78c59f4a3fabfb38b63c80a6c863736ba34;p=php

Merge branch 'PHP-7.0' into PHP-7.1

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

0738a78c59f4a3fabfb38b63c80a6c863736ba34