]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorFelipe Pena <felipensp@gmail.com>
Sat, 30 Nov 2013 13:41:01 +0000 (11:41 -0200)
committerFelipe Pena <felipensp@gmail.com>
Sat, 30 Nov 2013 13:41:01 +0000 (11:41 -0200)
* PHP-5.6:
  - Fixed bug #65923 (ext/socket assumes AI_V4MAPPED is defined)


Trivial merge