From: Andrey Hristov <andrey@php.net>
Date: Fri, 19 Apr 2013 14:29:53 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0beta4~34^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7b7424c34cf00f1e0595b9acfaed44f0bd70c7eb;p=php

Merge branch 'PHP-5.4' into PHP-5.5
---

7b7424c34cf00f1e0595b9acfaed44f0bd70c7eb