]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorDmitry Stogov <dmitry@zend.com>
Thu, 29 Oct 2015 17:07:37 +0000 (20:07 +0300)
committerDmitry Stogov <dmitry@zend.com>
Thu, 29 Oct 2015 17:07:37 +0000 (20:07 +0300)
* PHP-7.0:
  Fixed memory leak in php_stream_context_set_option()


Trivial merge