]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Fri, 28 Nov 2014 11:25:08 +0000 (12:25 +0100)
committerAnatol Belski <ab@php.net>
Fri, 28 Nov 2014 11:25:08 +0000 (12:25 +0100)
* PHP-5.6:
  disable ext/openssl/tests/stream_server_reneg_limit.phpt for windows


Trivial merge