From: Johannes Schlüter <johannes@php.net>
Date: Tue, 16 Jul 2013 11:55:32 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.1~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e1a0c90b8b032ce8a677b5aeca9920ceac41fc72;p=php

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

e1a0c90b8b032ce8a677b5aeca9920ceac41fc72