From: Johannes Schlüter <johannes@php.net>
Date: Sun, 24 Mar 2013 16:33:17 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0beta2~15^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d9003828149380322e7b8d3e60c3001ae905f29c;p=php

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

d9003828149380322e7b8d3e60c3001ae905f29c