From: Felipe Pena <felipensp@gmail.com>
Date: Sat, 30 Nov 2013 13:41:01 +0000 (-0200)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~353^2~171^2~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=52611a2c7e5d072d83803ff79fc472d023c05b04;p=php

Merge branch 'PHP-5.6'

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

52611a2c7e5d072d83803ff79fc472d023c05b04