]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorStanislav Malyshev <stas@php.net>
Sun, 17 Feb 2013 21:30:04 +0000 (13:30 -0800)
committerStanislav Malyshev <stas@php.net>
Sun, 17 Feb 2013 21:30:04 +0000 (13:30 -0800)
* PHP-5.5:
  fix bug #61930: openssl corrupts ssl key resource when using openssl_get_publickey()


Trivial merge