]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorStanislav Malyshev <stas@php.net>
Sun, 18 Aug 2013 23:55:03 +0000 (16:55 -0700)
committerStanislav Malyshev <stas@php.net>
Sun, 18 Aug 2013 23:55:03 +0000 (16:55 -0700)
* PHP-5.5:
  Fix for php bug #64802 includes test case

1  2 
ext/openssl/openssl.c

Simple merge