From: Johannes Schlüter <johannes@php.net>
Date: Tue, 23 Jul 2013 10:57:08 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.2RC1~11^2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5a8b0ca8fa00fdc70b2d55be02ef9d7472990bec;p=php

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

5a8b0ca8fa00fdc70b2d55be02ef9d7472990bec