]> granicus.if.org Git - php/commitdiff
Merge branch 'phpng' of git.php.net:php-src into phpng
authorDmitry Stogov <dmitry@zend.com>
Thu, 31 Jul 2014 06:55:39 +0000 (10:55 +0400)
committerDmitry Stogov <dmitry@zend.com>
Thu, 31 Jul 2014 06:55:39 +0000 (10:55 +0400)
* 'phpng' of git.php.net:php-src:
  Fixed getDefaultProperties (it should not return reference)
  Fixed invalid free
  Fixed segfault


Trivial merge