]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2e6d830 78f69a2)
Merge branch 'PHP-5.5' into PHP-5.6
authorFelipe Pena <felipensp@gmail.com>
Sat, 30 Nov 2013 13:40:42 +0000 (11:40 -0200)
committerFelipe Pena <felipensp@gmail.com>
Sat, 30 Nov 2013 13:40:42 +0000 (11:40 -0200)
* PHP-5.5:
  - Fixed bug #65923 (ext/socket assumes AI_V4MAPPED is defined)


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.