From: Popa Adrian Marius <mapopa@reea.net>
Date: Wed, 28 Jan 2015 13:39:58 +0000 (+0200)
Subject: Merge branch 'master' of https://git.php.net/push/php-src
X-Git-Tag: PRE_PHP7_REMOVALS~21^2~81^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=be29cb15a61a68c2335412661ce1d5025d603100;p=php

Merge branch 'master' of https://git.php.net/push/php-src

* 'master' of https://git.php.net/push/php-src:
  Fixed #68868 (Segfault in clean_non_persistent_constants() in SugarCRM 6.5.20)
---

be29cb15a61a68c2335412661ce1d5025d603100