]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1' of git.php.net:php-src into PHP-7.1
authorDmitry Stogov <dmitry@zend.com>
Mon, 29 Aug 2016 17:37:01 +0000 (20:37 +0300)
committerDmitry Stogov <dmitry@zend.com>
Mon, 29 Aug 2016 17:37:01 +0000 (20:37 +0300)
* 'PHP-7.1' of git.php.net:php-src:
  fix double free


Trivial merge