]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of https://git.php.net/push/php-src
authorPopa Adrian Marius <mapopa@reea.net>
Wed, 28 Jan 2015 13:39:58 +0000 (15:39 +0200)
committerPopa Adrian Marius <mapopa@reea.net>
Wed, 28 Jan 2015 13:39:58 +0000 (15:39 +0200)
* 'master' of https://git.php.net/push/php-src:
  Fixed #68868 (Segfault in clean_non_persistent_constants() in SugarCRM 6.5.20)


Trivial merge