]> granicus.if.org Git - php/commit
Merge remote-tracking branch 'php/master'
authorAnatol Belski <ab@php.net>
Tue, 19 Aug 2014 07:58:35 +0000 (09:58 +0200)
committerAnatol Belski <ab@php.net>
Tue, 19 Aug 2014 07:58:35 +0000 (09:58 +0200)
commit5dc4f44f3e37a4f2f818ec26891882b427af14a0
tree497641926d2efa95278bae20010fa25bab024979
parent30e0aa5b6b01d206326671e87d5ca6f21aa13fdd
parent6070757c77a226fecce5f2d029084cf68c979762
Merge remote-tracking branch 'php/master'

Conflicts:
ext/standard/dns.c
ext/standard/dns.c