]> granicus.if.org Git - php/commitdiff
Merge branch 'phpng' of git.php.net:php-src into phpng
authorDmitry Stogov <dmitry@zend.com>
Thu, 15 May 2014 08:32:15 +0000 (12:32 +0400)
committerDmitry Stogov <dmitry@zend.com>
Thu, 15 May 2014 08:32:15 +0000 (12:32 +0400)
* 'phpng' of git.php.net:php-src:
  fix leak
  zend_hash_del>zend_hash_str_del
  unused local var


Trivial merge