From: Johannes Schlüter <johannes@php.net>
Date: Tue, 8 May 2012 15:30:46 +0000 (+0200)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~226
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=544c6f2f224586b24990b342b187a8ddf8c1aedf;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  Fix #61704 (Crash apache, phpinfo() threading issue)
  Fix folding marks
---

544c6f2f224586b24990b342b187a8ddf8c1aedf