From: Johannes Schlüter <johannes@php.net>
Date: Sun, 22 Apr 2012 00:25:36 +0000 (+0200)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~276
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ca7b122c8ce050685fd4f0bbb3dad57e4d01741c;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  Fix folding
---

ca7b122c8ce050685fd4f0bbb3dad57e4d01741c