From: Johannes Schlüter <johannes@php.net>
Date: Wed, 16 Jan 2013 16:38:55 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha5~59
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d7d9ce0f4257d65527766b367aefcea25ef264f4;p=php

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

d7d9ce0f4257d65527766b367aefcea25ef264f4