]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorMichael Wallner <mike@php.net>
Wed, 2 Apr 2014 09:11:23 +0000 (11:11 +0200)
committerMichael Wallner <mike@php.net>
Wed, 2 Apr 2014 09:11:23 +0000 (11:11 +0200)
commit669459da8c9c3b396c9c80d751f28846f6375b19
tree683362a7821b70c2e8b482e4849e8b8d9f617efc
parent88a44b15d7c7b68050b17c1877493668c8af10c6
parentaf147ac9b7619fa56a3e6607d4109ef9c127a914
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix bug #64330
main/streams/xp_socket.c