From: Johannes Schlüter <johannes@php.net>
Date: Wed, 19 Jun 2013 13:09:33 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c6b8d992bad736963ac11b3b8d8ac5133ac346fc;p=php

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

c6b8d992bad736963ac11b3b8d8ac5133ac346fc