]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:php-src
authorDmitry Stogov <dmitry@zend.com>
Tue, 21 Jun 2016 13:55:59 +0000 (16:55 +0300)
committerDmitry Stogov <dmitry@zend.com>
Tue, 21 Jun 2016 13:55:59 +0000 (16:55 +0300)
* 'master' of git.php.net:php-src:
  re-fix leak
  re-fix leak
  Revert "fix leak"
  Revert "fix leak"


Trivial merge