]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorPierrick Charron <pierrick@php.net>
Sun, 30 Dec 2012 04:16:53 +0000 (23:16 -0500)
committerPierrick Charron <pierrick@php.net>
Sun, 30 Dec 2012 04:16:53 +0000 (23:16 -0500)
* PHP-5.5:
  Fixed bug #63874 (Segfaul if php_strip_whitespace has heredoc)


Trivial merge