From: Johannes Schlüter <johannes@php.net>
Date: Wed, 5 Dec 2012 18:03:15 +0000 (+0100)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~672^2~32
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c058ed51e31f0399f94a219f25efafaccad63317;p=php

Merge branch 'PHP-5.5'
---

c058ed51e31f0399f94a219f25efafaccad63317