From: Felipe Pena <felipensp@gmail.com>
Date: Sat, 30 Nov 2013 13:40:42 +0000 (-0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0alpha1~154
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a2f478cd945eb3344c0d2acbcdbbd10e97c1f2c3;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  - Fixed bug #65923 (ext/socket assumes AI_V4MAPPED is defined)
---

a2f478cd945eb3344c0d2acbcdbbd10e97c1f2c3