From: Boris Lytochkin <lytboris@php.net>
Date: Thu, 7 Feb 2013 10:49:45 +0000 (+0400)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha5~30^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6c5c04888d95c7e5f7d3b355df6c302cb23161d0;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix bug #64124 (IPv6 malformed)
---

6c5c04888d95c7e5f7d3b355df6c302cb23161d0