]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Sun, 1 Feb 2015 07:34:27 +0000 (23:34 -0800)
committerStanislav Malyshev <stas@php.net>
Sun, 1 Feb 2015 07:34:27 +0000 (23:34 -0800)
commitd82424b46f1023906135f87ae8112bcf932bca4e
treeb7792f31cb59f6d5e322609b9ff6365f3c01c9e1
parent380741daa40a8f8311cc41a015662b0ea1632d9e
parent94d6cb4a78956ac1505dc4141f052f7146114d74
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix TSRM
ext/standard/dns.c