- Fixed bug #65923 (ext/socket assumes AI_V4MAPPED is defined)
Merge branch 'PHP-5.5' into PHP-5.6

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

* PHP-5.6:
  - Fixed bug #65923 (ext/socket assumes AI_V4MAPPED is defined)
Merge branch 'master' of git.php.net:/php-src