From: Johannes Schlüter <johannes@php.net>
Date: Wed, 10 Jul 2013 17:38:00 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.1~42^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=26019d20228eea3b2956971c894e6231eb17ef6d;p=php

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

26019d20228eea3b2956971c894e6231eb17ef6d